Kaynağa Gözat

修改问题

cb_luzhixia 1 ay önce
ebeveyn
işleme
7588aebcd3

+ 24 - 2
src/components/costAudit/AuditEntityFormtDialog.vue

@@ -213,7 +213,7 @@
   import { regionMixin, catalogMixin, commonMixin } from '@/mixins/useDict'
   // 引入弹窗组件
   import CostAuditDialog from '@/components/costAudit/CostAuditDialog'
-  import { getAllUserList } from '@/api/uc'
+  import { getOrgUserQuery } from '@/api/uc'
   export default {
     name: 'AuditEntityFormtDialog',
     // 注册组件
@@ -461,7 +461,29 @@
     // 组件方法
     methods: {
       getUser() {
-        getAllUserList()
+        let data = {
+          pageBean: {
+            page: 1,
+            pageSize: 50,
+            total: 1,
+          },
+          sorter: [
+            {
+              direction: 'DESC',
+              property: 'updateTime',
+            },
+          ],
+          querys: [
+            {
+              property: 'ORG_ID_',
+              value: '1930078047826903040',
+              group: 'orgTree',
+              relation: 'AND',
+              operation: 'IN',
+            },
+          ],
+        }
+        getOrgUserQuery()
           .then((res) => {
             this.userList = res.value || []
           })

+ 0 - 4
src/plugins/pinyinAbbreviation.js

@@ -120,10 +120,6 @@ Vue.directive('pinyin-abbreviation', {
             // 兼容性处理,直接赋值
             currentObj[lastPart] = abbreviation
           }
-
-          console.log(
-            `已将拼音缩写设置到目标字段 ${targetInput}: ${abbreviation}`
-          )
         } catch (e) {
           console.error(`设置目标字段 ${targetInput} 失败:`, e)
           // 失败时回退到 dataset 存储

+ 12 - 25
src/views/costAudit/baseInfo/auditReviewDocManage/index.vue

@@ -6,17 +6,21 @@
       <div class="search-area">
         <el-form :inline="true" size="small">
           <!-- 文本名称输入框 -->
-          <el-form-item label="文名称:">
+          <el-form-item label="文名称:">
             <el-input
               v-model="searchForm.documentName"
-              placeholder="请输入"
+              placeholder="请输入文书名称"
               clearable
             ></el-input>
           </el-form-item>
 
           <!-- 是否启用下拉选择 -->
           <el-form-item label="是否启用:">
-            <el-select v-model="searchForm.status" placeholder="全部">
+            <el-select
+              v-model="searchForm.status"
+              placeholder="全部"
+              clearable=""
+            >
               <el-option label="全部" value=""></el-option>
               <el-option label="启用" value="1"></el-option>
               <el-option label="停用" value="0"></el-option>
@@ -765,10 +769,7 @@
 
       // 修改按钮点击事件
       async handleEdit(row) {
-        this.initEditData({
-          ...row,
-        })
-
+        this.initEditData(row)
         this.activeView = 'edit'
         this.view = 'edit'
         this.isDisabled = false
@@ -807,24 +808,9 @@
           fileUrl: data.fileUrl ? [data.fileUrl] : [],
         }
         this.fileUrl = data.fileUrl
-        this.getDocumentData()
-
-        // 如果是修改模式,从第一步开始
         this.activeStep = 0
       },
 
-      // 初始化详情数据
-      initDetailData(data) {
-        this.detailData = data
-        // getDocumentTemplateById(data.id).then((res) => {
-        //   // 设置文件信息
-        //   // this.detailUploadedFile = data.fileInfo || null
-
-        //   // 设置数据项
-        //   // this.detailDataFields = this.dataFields
-        // })
-      },
-
       // 选中行变化事件
       handleSelectionChange(val) {
         this.selectedRows = val
@@ -948,10 +934,11 @@
       handleNextStep() {
         this.$refs.basicForm.validate((valid) => {
           if (valid) {
-            if (!this.isDisabled) {
-              this.handleSave()
-            } else {
+            if (this.view == 'detail' || this.view == 'edit') {
+              this.getDocumentData()
               this.activeStep = 1
+            } else {
+              this.handleSave()
             }
           } else {
             this.$message.error('请填写完整的基础信息')

+ 43 - 30
src/views/costAudit/projectInfo/auditProjectManage/annualReviewPlan/CatalogCascader.vue

@@ -4,8 +4,7 @@
     v-model="catalogId"
     :options="catalogListOptions"
     :placeholder="formItem.placeholder || catalogProps.placeholder"
-    v-bind="catalogProps"
-    @change="handleCascaderChange"
+    v-bind="props"
   ></el-cascader>
 </template>
 
@@ -29,49 +28,63 @@
       return {
         submitting: false,
         catalogId: [],
+        props: {
+          filterable: true,
+          placeholder: '请选择关联监审项目',
+          style: 'width: 100%',
+          showAllLevels: false,
+          props: {
+            multiple: false,
+            children: 'children',
+            checkStrictly: true,
+            label: 'catalogName',
+            value: 'id',
+          },
+        },
       }
     },
     watch: {
       value: {
         handler(newVal) {
-          this.handleValueChange(newVal)
+          // this.handleValueChange(newVal)
         },
         immediate: true, // 初始化时立即执行
       },
       // 监听目录数据变化,数据加载完成后处理回显
-      catalogListOptions: {
-        handler(newVal) {
-          if (newVal && newVal.length > 0) {
-            // 数据加载完成后,重新处理value
-            this.handleValueChange(this.value)
-          }
-        },
-        immediate: true,
-      },
+      // catalogListOptions: {
+      //   handler(newVal) {
+      //     if (newVal && newVal.length > 0) {
+      //       // 数据加载完成后,重新处理value
+      //       this.handleValueChange(this.value)
+      //     }
+      //   },
+      //   immediate: true,
+      // },
     },
     mounted() {},
     methods: {
       handleValueChange(newVal) {
+        console.log('newVal', newVal)
         // 只有当目录数据加载完成后才处理回显
-        if (this.catalogListOptions && this.catalogListOptions.length > 0) {
-          const formattedData = this.formatRelatedItemsForDisplay({
-            catalogId: {
-              value: newVal,
-              options: this.catalogListOptions,
-              id: 'id',
-              parentId: 'parentId',
-            },
-          })
-          this.catalogId = formattedData.catalogId || []
-        }
-      },
-      handleCascaderChange(value) {
-        // 处理级联选择器多选数据
-        const resultData = this.extractLastLevelValues({
-          catalogId: value,
-        })
-        this.$emit('change', resultData.catalogId)
+        // if (this.catalogListOptions && this.catalogListOptions.length > 0) {
+        //   const formattedData = this.formatRelatedItemsForDisplay({
+        //     catalogId: {
+        //       value: newVal,
+        //       options: this.catalogListOptions,
+        //       id: 'id',
+        //       parentId: 'parentId',
+        //     },
+        //   })
+        //   this.catalogId = formattedData.catalogId || []
+        // }
       },
+      // handleCascaderChange(value) {
+      //   // 处理级联选择器多选数据
+      //   const resultData = this.extractLastLevelValues({
+      //     catalogId: value,
+      //   })
+      //   this.$emit('change', resultData.catalogId)
+      // },
     },
   }
 </script>

+ 1 - 7
src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/surveyTab.vue

@@ -36,13 +36,6 @@
         type: Boolean,
         default: false,
       },
-      surveyData: {
-        type: Object,
-        default: () => ({
-          list: [],
-          surveyColumns: [],
-        }),
-      },
     },
     data() {
       return {
@@ -63,6 +56,7 @@
       }
     },
     mounted() {},
+
     methods: {
       // 查看成本调查表内容弹窗
       handleViewTemplate(data) {

+ 30 - 53
src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/workflowTab.vue

@@ -34,7 +34,7 @@
       </el-button>
     </div>
     <CostAuditTable
-      :table-data="localWorkflowData.list"
+      :table-data="workflowData.list"
       :columns="workflowData.listColumns"
       :show-index="true"
       :show-action-column="true"
@@ -79,7 +79,7 @@
         ></el-date-picker>
       </div>
       <CostAuditTable
-        :table-data="localWorkflowData.stepList"
+        :table-data="workflowData.stepList"
         :columns="workflowData.workflowColumns"
         :show-index="true"
         :show-pagination="true"
@@ -87,7 +87,7 @@
         :table-props="{
           maxHeight: '500',
         }"
-        :pagination="localWorkflowData.pagination"
+        :pagination="workflowData.pagination"
         @pagination-change="handlePaginationChange"
       >
         <template #mainUserId="{ row }">
@@ -278,7 +278,6 @@
     saveProcess,
   } from '@/api/taskCustomizedRelease.js'
   import CostAuditTable from '@/components/costAudit/CostAuditTable.vue'
-  import { RFC_2822 } from 'moment'
   export default {
     components: { CostAuditTable },
     mixins: [taskMixin],
@@ -292,31 +291,13 @@
         type: Boolean,
         default: false,
       },
-      workflowData: {
-        type: Object,
-        default: () => ({
-          list: [],
-          detailInfo: {},
-        }),
-      },
     },
     data() {
-      return {
-        localWorkflowData: { ...this.workflowData },
-      }
+      return {}
     },
     computed: {},
-    watch: {
-      workflowData: {
-        handler(newVal) {
-          this.localWorkflowData = { ...newVal }
-        },
-        deep: true,
-      },
-    },
-    mounted() {
-      this.localWorkflowData = { ...this.workflowData }
-    },
+    mounted() {},
+
     methods: {
       formatterUserList(userId) {
         return this.userList.filter((item) => item.userId !== userId)
@@ -324,27 +305,25 @@
       handleSetWorkflow() {
         this.getUser()
         this.dialogs.setStepDialogVisible = true
-        if (this.localWorkflowData.list.length > 0) {
-          this.localWorkflowData.stepList = this.localWorkflowData.list
-          this.localWorkflowData.stepList = this.localWorkflowData.list.map(
-            (item) => ({
-              ...item,
-              userId: item.userId ? item.userId.split(',') : [],
-              status: item.status ? item.status.split(',') : [],
-            })
-          )
+        if (this.workflowData.list.length > 0) {
+          this.workflowData.stepList = this.workflowData.list
+          this.workflowData.stepList = this.workflowData.list.map((item) => ({
+            ...item,
+            userId: item.userId ? item.userId.split(',') : [],
+            status: item.status ? item.status.split(',') : [],
+          }))
         } else {
           getCostProjectNodeTmpletePageList({
-            pageNum: this.localWorkflowData.pagination.currentPage,
-            pageSize: this.localWorkflowData.pagination.pageSize,
+            pageNum: this.workflowData.pagination.currentPage,
+            pageSize: this.workflowData.pagination.pageSize,
             processId: '1',
           }).then((res) => {
-            this.localWorkflowData.stepList = res.value.records.map((item) => ({
+            this.workflowData.stepList = res.value.records.map((item) => ({
               ...item,
               userId: item.userId ? item.userId.split(',') : [],
               status: item.status ? item.status.split(',') : [],
             }))
-            this.localWorkflowData.pagination.total = res.value.total
+            this.workflowData.pagination.total = res.value.total
           })
         }
       },
@@ -371,24 +350,22 @@
         this.$refs[formName].validate((valid) => {
           if (valid) {
             if (type == 'list') {
-              this.localWorkflowData.list = this.localWorkflowData.list.map(
-                (item) => {
-                  if (
-                    item.processNodeKey ==
-                    this.formData.currentStep.processNodeKey
-                  ) {
-                    return {
-                      ...item,
-                      ...this.formData.currentStep,
-                      userId: this.formData.currentStep.userId.join(','),
-                      status: this.formData.currentStep.status.join(','),
-                    }
+              this.workflowData.list = this.workflowData.list.map((item) => {
+                if (
+                  item.processNodeKey ==
+                  this.formData.currentStep.processNodeKey
+                ) {
+                  return {
+                    ...item,
+                    ...this.formData.currentStep,
+                    userId: this.formData.currentStep.userId.join(','),
+                    status: this.formData.currentStep.status.join(','),
                   }
-                  return item
                 }
-              )
+                return item
+              })
               // 触发自定义事件通知父组件数据已更新
-              this.$emit('update:workflowData', { ...this.localWorkflowData })
+              this.$emit('update:workflowData', { ...this.workflowData })
               this.handleSaveSetStep('list')
             }
           } else {