Merge branch 'release_v1.0.0' of http://git.qmth.com.cn/sop/web into dev_1.0.1

build/config/define.js

@@ -1,7 +1,9 @@
 import dayjs from 'dayjs';
 
 /** 项目构建时间 */
-const PROJECT_BUILD_TIME = JSON.stringify(dayjs().format('YYYY-MM-DD HH:mm:ss'));
+const PROJECT_BUILD_TIME = JSON.stringify(
+  dayjs().format('YYYY/MM/DD HH:mm:ss')
+);
 
 export const viteDefine = {
   PROJECT_BUILD_TIME,

src/components/global/search-form/components/search-form-item.vue

@@ -96,6 +96,9 @@
     <t-date-range-picker
       v-model="params[item.prop]"
       value-type="time-stamp"
+      enable-time-picker
+      format="YYYY/MM/DD HH:mm"
+      :time-picker-props="{ format: 'HH:mm' }"
       v-bind="attrs"
     />
   </template>

src/utils/filter.js

@@ -54,7 +54,7 @@ export function educationTypeFilter(val) {
 export function timestampFilter(val, fmt = 'mm') {
   // fmt: dd or yyyy-MM-dd
   const formats = {
-    dd: 'yyyy-MM-dd',
+    dd: 'yyyy/MM/dd',
     mm: 'yyyy/MM/dd HH:mm',
     ss: 'yyyy/MM/dd HH:mm:ss',
   };

src/utils/tool.js

@@ -174,7 +174,7 @@ export const generateId = function () {
 /* 日期格式化 */
 export const dateFormat = (
   date,
-  fmt = 'yyyy-MM-dd HH:mm:ss',
+  fmt = 'yyyy/MM/dd HH:mm:ss',
   isDefault = '-'
 ) => {
   if (!date) {

src/views/login/index.vue

@@ -41,9 +41,9 @@
           :rules="rules"
           v-if="loginType === 'ACCOUNT'"
         >
-          <t-form-item name="mobileNumber">
+          <t-form-item name="loginName">
             <t-input
-              v-model="formData.mobileNumber"
+              v-model="formData.loginName"
               clearable
               placeholder="请输入手机号码"
               size="large"
@@ -192,7 +192,7 @@ const route = useRoute();
 const router = useRouter();
 
 const formData = reactive({
-  mobileNumber: '',
+  loginName: '',
   password: '',
 });
 const formData2 = reactive({
@@ -200,10 +200,10 @@ const formData2 = reactive({
   code: '',
 });
 const rules = {
-  mobileNumber: [
+  loginName: [
     {
       required: true,
-      message: '请输入手机号',
+      message: '请输入账号',
       type: 'error',
       trigger: 'change',
     },
@@ -242,7 +242,7 @@ const loginHandle = () => {
         let params =
           loginType.value === 'ACCOUNT'
             ? {
-                mobileNumber: formData.mobileNumber,
+                loginName: formData.loginName,
                 password: getBase64(formData.password),
               }
             : formData2;
@@ -267,7 +267,7 @@ const loginHandle = () => {
 };
 const findSuccess = () => {
   forgetStatus.value = false;
-  formData.mobileNumber = '';
+  formData.loginName = '';
   formData.password = '';
 };
 </script>

src/views/my-workbenches/workbenches/notice/index.vue

@@ -43,7 +43,7 @@
     >
       <h2 class="text-center notice-title">{{ curNotice.title }}</h2>
       <div class="text-center notice-subtitle"
-        >发布时间：{{ dateFormat(curNotice.sendTime, 'yyyy-MM-dd') }}</div
+        >发布时间：{{ dateFormat(curNotice.sendTime, 'yyyyMM-dd') }}</div
       >
       <div class="notice-content" v-html="curNotice.content"></div>
 
@@ -57,7 +57,7 @@
 <script setup name="Notice">
 import { reactive, computed, ref } from 'vue';
 import useFetchTable from '@/hooks/useFetchTable';
-import {getMyMessages, setMyMessagesRead} from '@/api/my-workbenches';
+import { getMyMessages, setMyMessagesRead } from '@/api/my-workbenches';
 import NoticeList from './notice-list.vue';
 import { omit } from 'lodash';
 import { dateFormat } from '@/utils/tool';
@@ -70,10 +70,10 @@ const visible = ref(false);
 const open = (notice) => {
   curNotice.value = notice;
   visible.value = true;
-  setMyMessagesRead(curNotice.value.id).then(()=> {
-    search()
+  setMyMessagesRead(curNotice.value.id).then(() => {
+    search();
     workStore.updateWorkCounts();
-  })
+  });
 };
 
 const tabs = [

src/views/resource-guard/person-guard/person-files/add-person-file-dialog.vue

@@ -103,7 +103,7 @@
               v-model="formData.archivesTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>
@@ -126,7 +126,7 @@
               v-model="formData.authenticationTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
               :disable-date="{ after: formData.examEndTime || undefined }"
             />
@@ -150,7 +150,7 @@
               v-model="formData.authenticationValidTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
               :disable-date="{
                 before: formData.authenticationTime || undefined,

src/views/service-unit/dispatch/dispatch-manage/add-dispatch-dialog.vue

@@ -25,7 +25,7 @@
               v-model="formData.beginTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>
@@ -65,7 +65,7 @@
               v-model="formData.examStartTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>
@@ -76,7 +76,7 @@
               v-model="formData.examEndTime"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>

src/views/service-unit/service-unit-manage/unit-manage/add-unit-dialog.vue

@@ -27,7 +27,7 @@
           :disable-date="{ after: formData.endTime || undefined }"
           value-type="time-stamp"
           enable-time-picker
-          format="YYYY-MM-DD HH:mm"
+          format="YYYY/MM/DD HH:mm"
           :time-picker-props="{ format: 'HH:mm' }"
         />
       </t-form-item>
@@ -37,7 +37,7 @@
           :disable-date="{ before: formData.startTime || undefined }"
           value-type="time-stamp"
           enable-time-picker
-          format="YYYY-MM-DD HH:mm"
+          format="YYYY/MM/DD HH:mm"
           :time-picker-props="{ format: 'HH:mm' }"
         />
       </t-form-item>

src/views/sop/components/dynamic-form-item/DATE.vue

@@ -5,7 +5,7 @@
     :disabled="!config.writable"
     style="width: 100%"
     enable-time-picker
-    format="YYYY-MM-DD HH:mm"
+    format="YYYY/MM/DD HH:mm"
     :time-picker-props="{ format: 'HH:mm' }"
     @change="emitChange"
   />

src/views/sop/sop-manage/device-out-in/add-device-dialog.vue

@@ -23,7 +23,7 @@
               style="width: 100%"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>

src/views/sop/sop-manage/plan-change/index.vue

@@ -189,7 +189,6 @@
               <h2>
                 {{ sopInfo.statusStr }}
               </h2>
-              <p>{{ stepDuration }}</p>
             </div>
             <div class="content-body">
               <t-collapse>
@@ -269,18 +268,21 @@ const emit = defineEmits(['confirm', 'cancel']);
 const sopInfo = ref({ ...props.sop });
 const stepHistoryShow = ref(false);
 const flowApproveHistoryList = ref([]);
-const stepDuration = ref('');
 
-function getFlowApproveHistoryList(data) {
+function getFlowApproveHistoryList(data, allStepData) {
   if (!data) return [];
 
+  let setupData = {};
+  allStepData.forEach((item) => {
+    setupData[item.setup] = item.taskName;
+  });
   let lastTime = 0;
   return data.map((item, index) => {
     let nitem = { ...item };
     nitem.duration =
       index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    nitem.taskName = item.approveRemark;
+    nitem.taskName = setupData[item.approveSetup];
     return nitem;
   });
 }
@@ -369,9 +371,11 @@ const initData = async () => {
   sopInfo.value.examStartTime = res.crmInfo.examStartTime;
   sopInfo.value.examEndTime = res.crmInfo.examEndTime;
   sopInfo.value.productName = res.crmInfo.productName;
+  sopInfo.value.statusStr = props.sop.projectExchangeFlowStatusStr;
 
   flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList
+    res.flowApproveHistoryList,
+    res.flowTaskHistoryList
   );
 
   for (const key in res.tbProjectExchange) {

src/views/system/config-manage/device-manage/edit-device-dialog.vue

@@ -45,7 +45,7 @@
               mode="date"
               value-type="time-stamp"
               enable-time-picker
-              format="YYYY-MM-DD HH:mm"
+              format="YYYY/MM/DD HH:mm"
               :time-picker-props="{ format: 'HH:mm' }"
             />
           </t-form-item>

src/views/system/notice-log/notice-manage/index.vue

@@ -40,6 +40,10 @@
           {{ noticeTypeFilter(row[col.colKey]) }}
         </template>
         <template #name="{ col, row }">
+          <t-link
+              hover="color"
+              @click="open(row)"
+          >
           <span>{{ row.title }}</span>
           <span>
             【 {{ row.createName + '：'
@@ -49,6 +53,7 @@
                 : '暂未发布'
             }}】
           </span>
+          </t-link>
         </template>
         <template #status="{ col, row }">
           <status-tag :value="row[col.colKey]" type="notice"></status-tag>
@@ -112,6 +117,20 @@
       v-model:visible="showNoticeMessageDialog"
       :curRow="curRow"
     ></notice-message-dialog>
+    <t-drawer
+        v-model:visible="visible"
+        header="通知公告"
+        size="80%"
+        :close-btn="true"
+    >
+      <h2 class="text-center notice-title">{{ curRow?.title }}</h2>
+      <div class="text-center notice-subtitle">创建时间：{{ timestampFilter(curRow?.createTime) }}</div>
+      <div class="notice-content" v-html="curRow?.content"></div>
+
+      <template #footer>
+        <t-button theme="primary" @click="visible = false">返回</t-button>
+      </template>
+    </t-drawer>
   </div>
 </template>
 
@@ -128,12 +147,12 @@ import {
   noticePublishApi,
   noticeCancelPublishApi,
 } from '@/api/system';
-import { dictToOptionList } from '@/utils/tool';
+import {dateFormat, dictToOptionList} from '@/utils/tool';
 import { NOTICE_TYPE, PUBLISH_STATUS } from '@/config/constants';
 import { noticeTypeFilter, timestampFilter } from '@/utils/filter';
 import usePermission from '@/hooks/usePermission';
 const { perm } = usePermission();
-
+const visible = ref(false);
 const showEditNoticeDialog = ref(false);
 const showNoticeMessageDialog = ref(false);
 const curRow = ref(null);
@@ -210,6 +229,7 @@ const columns = [
   { colKey: 'type', title: '类型', cell: 'type', width: 120 },
   { colKey: 'title', title: '消息名称', cell: 'name' },
   { colKey: 'status', title: '发布状态', cell: 'status', width: 120 },
+  { colKey: 'readCount', title: '回执进度', cell: 'readCount', width: 120 },
   {
     title: '管理',
     colKey: 'operate',
@@ -234,7 +254,10 @@ const {
 const selectChange = (value) => {
   selectedRowKeys.value = value;
 };
-
+const open = (notice) => {
+  curRow.value = notice;
+  visible.value = true;
+};
 const handleAdd = () => {
   curRow.value = null;
   showEditNoticeDialog.value = true;
@@ -301,3 +324,20 @@ const handlePublish = (row) => {
   });
 };
 </script>
+<style lang="less" scoped>
+.notice {
+  .notice-title {
+    color: #333;
+    font-size: 20px;
+  }
+  .notice-subtitle {
+    font-size: 13px;
+    margin-top: 6px;
+  }
+//.notice-content {
+//  font-size: 14px;
+//  margin-top: 10px;
+//  text-indent: 2em;
+//}
+}
+</style>

src/views/work-hours/work-hours-manage/abnormal-check/abnormal-detail-dialog.vue

@@ -199,26 +199,30 @@ const getUrls = (type) => {
   }
 };
 
-function getFlowApproveHistoryList(data) {
+function getFlowApproveHistoryList(data, allStepData) {
   if (!data) return [];
 
+  let setupData = {};
+  allStepData.forEach((item) => {
+    setupData[item.setup] = item.taskName;
+  });
   let lastTime = 0;
   return data.map((item, index) => {
     let nitem = { ...item };
     nitem.duration =
       index === 0 ? '-' : timeNumberToText(item.createTime - lastTime);
     lastTime = item.createTime;
-    nitem.taskName = item.approveSetup + '';
+    nitem.taskName = setupData[item.approveSetup];
     return nitem;
   });
 }
-
 const initDetail = async () => {
   stepHistoryShow.value = false;
   flowApproveHistoryList.value = [];
   const res = await workHoursCheckDetailApi(props.row.objId);
   flowApproveHistoryList.value = getFlowApproveHistoryList(
-    res.flowApproveHistoryList
+    res.flowApproveHistoryList,
+    res.flowTaskHistoryList
   );
 };
 const toViewHistory = () => {