zhangjie 1 жил өмнө
parent
commit
4de2e9057c

+ 4 - 4
src/views/project-quality/project-quality-manage/issues-feedback/index.vue

@@ -16,9 +16,9 @@
       </template>
       <template #user="{ item, params }">
         <select-url-user
-            v-model="params[item.prop]"
-            url="/api/admin/tb/quality/problem/apply/user/list"
-            clearable
+          v-model="params[item.prop]"
+          url="/api/admin/tb/quality/problem/apply/user/list"
+          clearable
         ></select-url-user>
       </template>
     </SearchForm>
@@ -62,7 +62,7 @@
         <template #operate="{ row }">
           <div class="table-operations">
             <t-link
-              v-if="perm.LINK_Approve"
+              v-if="perm.LINK_Approve && row.status !== 'FINISH'"
               theme="primary"
               hover="color"
               @click="auditQualityIssueHandle(row)"

+ 3 - 0
src/views/sop/sop-manage/quality-issue/index.vue

@@ -104,6 +104,7 @@ import {
 import { flowFormPropertiesApi, sopFlowViewApi } from '@/api/sop';
 import { MessagePlugin } from 'tdesign-vue-next';
 import DynamicFormItem from '../../components/dynamic-form-item/index.vue';
+import { CUSTOMER_TYPE } from '@/config/constants';
 
 const props = defineProps({
   sop: {
@@ -197,6 +198,8 @@ const initFill = async () => {
   sopInfo.crmName = crmInfo.value.crmName;
   sopInfo.productName = crmInfo.value.productName;
   sopInfo.serviceName = crmInfo.value.serviceUnitName;
+  sopInfo.sopNo = res.sopNo;
+  sopInfo.customManagerTypeStr = CUSTOMER_TYPE[crmInfo.value.customType];
 
   curStep.value = res.currFlowTaskResult.taskName;
   currFlowTaskResultSetup.value = res.currFlowTaskResult.setup;

+ 2 - 0
src/views/system/notice-log/log-manage/index.vue

@@ -13,6 +13,8 @@
             defaultCurrent: 1,
             defaultPageSize: 10,
             onChange,
+            showJumper: true,
+            showPageSize: false,
             total: pagination.total,
             current: pagination.pageNumber,
           }"

+ 1 - 0
src/views/user/auth-manage/role-manage/index.vue

@@ -20,6 +20,7 @@
           showJumper: true,
           showPageSize: false,
           total: pagination.total,
+          current: pagination.pageNumber,
         }"
         v-loading="tableLoading"
       >

+ 2 - 2
src/views/user/auth-manage/user-manage/index.vue

@@ -20,6 +20,7 @@
           showJumper: true,
           showPageSize: false,
           total: pagination.total,
+          current: pagination.pageNumber,
         }"
         v-loading="tableLoading"
       >
@@ -114,7 +115,6 @@ const {
   tableData,
   fetchData,
   onChange,
-  search,
 } = useFetchTable(getUserList);
 
 const handleAdd = () => {
@@ -170,7 +170,7 @@ const handleModifyPwd = (row) => {
 const addSuccess = () => {
   showAddUserDialog.value = false;
   MessagePlugin.success('操作成功');
-  search();
+  fetchData();
 };
 const updatePwdSuccess = () => {
   // showUpdateUserPwdDialog.value = false;