v1.9 优化工作单相关bug

wuxw
1 parent 8c097c75
Showing 9 changed files with 549 additions and 19 deletions
src/api/oa/doWorkApi.js
src/components/upload/uploadFile.vue
src/router/oaRouter.js
src/views/oa/addWorkList.vue
src/views/oa/copyWorkList.vue
src/views/oa/doCopyWork.vue
src/views/oa/doWorkLang.js
src/views/oa/editWorkList.vue
src/views/oa/workTaskDetailList.vue
@@ -17,4 +17,56 @@ export function queryTaskWork(params) {
       reject(error)
     })
   })
+}
+
+// 查询工单详情
+export function getWorkInfo(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/work.listWorkPool',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res.data)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 查询工单任务明细
+export function getWorkTaskItems(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/task.listWorkTaskItem',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res.data)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 完成抄送工单
+export function finishWorkCopy(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/work.finishWorkCopy',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      if (res.code === 0) {
+        resolve(res)
+      } else {
+        reject(new Error(res.msg || '操作失败'))
+      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
 }
 \ No newline at end of file
@@ -57,6 +57,11 @@ export default {
       this.fileName = file.name
       this.doUpload(file.raw)
     },
+    setFilePath(fileName) {
+      this.fileName = fileName
+      this.realFileName = fileName
+      this.progress = 100
+    },
     async doUpload(file) {
       const formData = new FormData()
       formData.append('uploadFile', file)
@@ -269,9 +269,14 @@ export default [
         name:'/pages/property/visitFinish',
         component: () => import('@/views/oa/visitFinishList.vue')
         },
-        {
-            path:'/pages/oa/workTaskDetail',
-            name:'/pages/oa/workTaskDetail',
-            component: () => import('@/views/oa/workTaskDetailList.vue')
-            },
+    {
+        path:'/pages/oa/workTaskDetail',
+        name:'/pages/oa/workTaskDetail',
+        component: () => import('@/views/oa/workTaskDetailList.vue')
+    },
+    {
+        path: '/views/oa/doCopyWork',
+        name: '/views/oa/doCopyWork',
+        component: () => import('@/views/oa/doCopyWork.vue')
+    }
 ]
 \ No newline at end of file
@@ -65,7 +65,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('addWork.attachment')">
-              <upload-file ref="uploadFile" @notifyFile="notifyFile" />
+              <upload-file ref="uploadFile" @notify="notifyFile" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -328,6 +328,7 @@ export default {
       }
     },
     notifyFile(data) {
+      this.addWorkInfo.pathUrls = []
       this.addWorkInfo.pathUrls.push(data.realFileName)
     },
     goBack() {
@@ -293,10 +293,10 @@ export default {
       this._listCopyWorks(this.page.current, this.page.size)
     },
     _toWorkDetailPage(work) {
-      this.$router.push(`/pages/oa/workDetail?workId=${work.workId}`)
+      this.$router.push(`/views/oa/workDetail?workId=${work.workId}`)
     },
     _openCopyWorkModel(work) {
-      this.$router.push(`/pages/oa/doCopyWork?workId=${work.workId}&copyId=${work.copyId}`)
+      this.$router.push(`/views/oa/doCopyWork?workId=${work.workId}&copyId=${work.copyId}`)
     },
     async _auditSubmit() {
       try {
+<template>
+  <div class="do-copy-work-container">
+    <el-card class="detail-card">
+      <div slot="header" class="flex justify-between">
+        <span class="">{{ $t('doCopyWork.detail.title') }}</span>
+        <el-button size="small" @click="goBack">
+          <i class="el-icon-back"></i>
+          {{ $t('common.back') }}
+        </el-button>
+      </div>
+      
+      <!-- 工单详情信息 -->
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.workId') }}</label>
+            <span>{{ doCopyWorkInfo.workId }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.workName') }}</label>
+            <span>{{ doCopyWorkInfo.workName }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.typeName') }}</label>
+            <span>{{ doCopyWorkInfo.typeName }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.workCycle') }}</label>
+            <span>{{ doCopyWorkInfo.workCycle === '1001' ? $t('doCopyWork.workCycle.once') : $t('doCopyWork.workCycle.periodic') }}</span>
+          </div>
+        </el-col>
+      </el-row>
+      
+      <el-row :gutter="20" class="margin-top">
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.startTime') }}</label>
+            <span>{{ doCopyWorkInfo.startTime }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.endTime') }}</label>
+            <span>{{ doCopyWorkInfo.endTime }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.createUserName') }}</label>
+            <span>{{ doCopyWorkInfo.createUserName }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.curStaffName') }}</label>
+            <span>{{ doCopyWorkInfo.curStaffName || '-' }}</span>
+          </div>
+        </el-col>
+      </el-row>
+      
+      <el-row :gutter="20" class="margin-top">
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.curCopyName') }}</label>
+            <span>{{ doCopyWorkInfo.curCopyName || '-' }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.stateName') }}</label>
+            <span>{{ doCopyWorkInfo.stateName }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.createTime') }}</label>
+            <span>{{ doCopyWorkInfo.createTime }}</span>
+          </div>
+        </el-col>
+        <el-col :span="6" v-if="doCopyWorkInfo.pathUrl">
+          <div class="info-item">
+            <label>{{ $t('doCopyWork.detail.attachment') }}</label>
+            <a :href="doCopyWorkInfo.pathUrl" target="_blank">{{ $t('doCopyWork.detail.download') }}</a>
+          </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 工单任务明细表格 -->
+    <el-card class="table-card margin-top">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('doCopyWork.table.title') }}</span>
+      </div>
+      <el-table :data="doCopyWorkInfo.items" border style="width: 100%">
+        <el-table-column :label="$t('doCopyWork.table.select')" align="center" width="80">
+          <template slot-scope="scope">
+            <el-radio 
+              v-if="scope.row.state === 'C'" 
+              v-model="doCopyWorkInfo.audit.itemId" 
+              :label="scope.row.itemId"
+              @change="selectContent(scope.row)">
+              &nbsp;
+            </el-radio>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('doCopyWork.table.content')" align="left">
+          <template slot-scope="scope">
+            <div class="flex justify-start">
+              <div>{{ scope.$index + 1 }}、</div>
+              <div v-html="scope.row.content"></div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" :label="$t('doCopyWork.table.remark')" align="center" width="300">
+        </el-table-column>
+        <el-table-column :label="$t('doCopyWork.table.state')" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.state === 'W' ? $t('doCopyWork.state.pending') : $t('doCopyWork.state.processed') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="staffName" :label="$t('doCopyWork.table.staffName')" align="center" width="150">
+        </el-table-column>
+        <el-table-column prop="finishTime" :label="$t('doCopyWork.table.finishTime')" align="center" width="180">
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <!-- 抄送办理 -->
+    <el-card class="audit-card margin-top" v-if="doCopyWorkInfo.audit.itemId">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('doCopyWork.audit.title') }}</span>
+      </div>
+      <el-form :model="doCopyWorkInfo.audit" label-width="120px">
+        <el-form-item 
+          :label="$t('doCopyWork.audit.deductionMoney')" 
+          v-if="doCopyWorkInfo.deduction === 'Y'">
+          <el-input-number 
+            v-model="doCopyWorkInfo.audit.deductionMoney" 
+            :placeholder="$t('doCopyWork.audit.deductionMoneyPlaceholder')"
+            :precision="2"
+            :min="0"
+            style="width: 100%">
+          </el-input-number>
+        </el-form-item>
+        <el-form-item :label="$t('doCopyWork.audit.deductionReason')">
+          <el-input 
+            type="textarea" 
+            v-model.trim="doCopyWorkInfo.audit.deductionReason"
+            :placeholder="$t('doCopyWork.audit.deductionReasonPlaceholder')"
+            :rows="4">
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="auditSubmit">
+            <i class="el-icon-check"></i>
+            {{ $t('common.submit') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getWorkInfo, getWorkTaskItems, finishWorkCopy } from '@/api/oa/doWorkApi'
+
+export default {
+  name: 'DoCopyWork',
+  data() {
+    return {
+      loading: false,
+      doCopyWorkInfo: {
+        workId: '',
+        wtId: '',
+        workName: '',
+        typeName: '',
+        workCycle: '',
+        startTime: '',
+        endTime: '',
+        createUserName: '',
+        curStaffName: '',
+        curCopyName: '',
+        stateName: '',
+        createTime: '',
+        items: [],
+        pathUrl: '',
+        taskId: '',
+        deduction: 'N',
+        audit: {
+          copyId: '',
+          deductionMoney: 0.00,
+          deductionReason: '',
+          itemId: ''
+        }
+      }
+    }
+  },
+  created() {
+    this.initData()
+  },
+  methods: {
+    async initData() {
+      this.doCopyWorkInfo.workId = this.$route.query.workId
+      this.doCopyWorkInfo.audit.copyId = this.$route.query.copyId
+      
+      if (!this.doCopyWorkInfo.workId) {
+        this.$message.warning(this.$t('doCopyWork.message.noWorkId'))
+        return
+      }
+      
+      await this.loadWorkInfo()
+      await this.loadWorkTaskItem()
+    },
+    
+    async loadWorkInfo() {
+      try {
+        this.loading = true
+        const params = {
+          workId: this.doCopyWorkInfo.workId,
+          page: 1,
+          row: 1
+        }
+        const data = await getWorkInfo(params)
+        if (data && data.length > 0) {
+          Object.assign(this.doCopyWorkInfo, data[0])
+        }
+      } catch (error) {
+        this.$message.error(this.$t('doCopyWork.message.loadWorkInfoError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    
+    async loadWorkTaskItem() {
+      try {
+        const params = {
+          taskId: this.doCopyWorkInfo.taskId,
+          workId: this.doCopyWorkInfo.workId,
+          page: 1,
+          row: 100
+        }
+        const data = await getWorkTaskItems(params)
+        this.doCopyWorkInfo.items = data || []
+      } catch (error) {
+        this.$message.error(this.$t('doCopyWork.message.loadTaskItemsError'))
+      }
+    },
+    
+    selectContent(item) {
+      if (item.state !== 'C') {
+        return
+      }
+      this.doCopyWorkInfo.audit.itemId = item.itemId
+    },
+    
+    async auditSubmit() {
+      if (!this.doCopyWorkInfo.audit.itemId) {
+        this.$message.warning(this.$t('doCopyWork.message.selectItem'))
+        return
+      }
+      
+      if (!this.doCopyWorkInfo.audit.deductionReason) {
+        this.$message.warning(this.$t('doCopyWork.message.inputReason'))
+        return
+      }
+      
+      if (this.doCopyWorkInfo.deduction === 'Y' && !this.doCopyWorkInfo.audit.deductionMoney) {
+        this.$message.warning(this.$t('doCopyWork.message.inputMoney'))
+        return
+      }
+      
+      try {
+        this.loading = true
+        await finishWorkCopy(this.doCopyWorkInfo.audit)
+        this.$message.success(this.$t('doCopyWork.message.submitSuccess'))
+        this.goBack()
+      } catch (error) {
+        this.$message.error(this.$t('doCopyWork.message.submitError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    
+    goBack() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.do-copy-work-container {
+  padding: 20px;
+
+  .text-title {
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+  .info-item {
+    padding: 8px 0;
+    
+    label {
+      color: #606266;
+      font-weight: 500;
+      margin-right: 10px;
+      
+      &::after {
+        content: ':';
+      }
+    }
+    
+    span {
+      color: #303133;
+    }
+    
+    a {
+      color: #409EFF;
+      text-decoration: none;
+      
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  .margin-top {
+    margin-top: 20px;
+  }
+
+  .table-card {
+    margin-top: 20px;
+  }
+
+  .audit-card {
+    margin-top: 20px;
+  }
+
+  .flex {
+    display: flex;
+  }
+
+  .justify-between {
+    justify-content: space-between;
+  }
+
+  .justify-start {
+    justify-content: flex-start;
+  }
+}
+</style>
+
@@ -33,6 +33,58 @@ export const messages = {
       },
       fetchError: 'Failed to fetch work orders'
     },
+    doCopyWork: {
+      detail: {
+        title: 'Work Order Details',
+        workId: 'Work Order ID',
+        workName: 'Work Order Name',
+        typeName: 'Type Name',
+        workCycle: 'Type',
+        startTime: 'Start Time',
+        endTime: 'End Time',
+        createUserName: 'Creator',
+        curStaffName: 'Processor',
+        curCopyName: 'CC',
+        stateName: 'Status',
+        createTime: 'Create Time',
+        attachment: 'Attachment',
+        download: 'Download'
+      },
+      table: {
+        title: 'Work Task Items',
+        select: 'Select',
+        content: 'Work Order Content',
+        remark: 'Processing Opinion',
+        state: 'Status',
+        staffName: 'Processor',
+        finishTime: 'Completion Time'
+      },
+      audit: {
+        title: 'CC Processing',
+        deductionMoney: 'Deduction Amount',
+        deductionMoneyPlaceholder: 'Required, please enter deduction amount',
+        deductionReason: 'Explanation',
+        deductionReasonPlaceholder: 'Required, please enter explanation'
+      },
+      state: {
+        pending: 'Pending',
+        processed: 'Processed'
+      },
+      workCycle: {
+        once: 'One-time Work Order',
+        periodic: 'Periodic Work Order'
+      },
+      message: {
+        noWorkId: 'Work order ID is missing',
+        loadWorkInfoError: 'Failed to load work order information',
+        loadTaskItemsError: 'Failed to load task items',
+        selectItem: 'Please select a processed task item',
+        inputReason: 'Please enter an explanation',
+        inputMoney: 'Please enter deduction amount',
+        submitSuccess: 'Submitted successfully',
+        submitError: 'Submission failed'
+      }
+    }
   },
   zh: {
     doWork: {
@@ -68,5 +120,57 @@ export const messages = {
       },
       fetchError: '获取工单列表失败'
     },
+    doCopyWork: {
+      detail: {
+        title: '任务单详情',
+        workId: '工单编号',
+        workName: '工单名称',
+        typeName: '类型名称',
+        workCycle: '标识',
+        startTime: '开始时间',
+        endTime: '结束时间',
+        createUserName: '发起人',
+        curStaffName: '处理人',
+        curCopyName: '抄送人',
+        stateName: '状态',
+        createTime: '创建时间',
+        attachment: '附件',
+        download: '下载'
+      },
+      table: {
+        title: '工作单内容',
+        select: '选择',
+        content: '工作单内容',
+        remark: '处理意见',
+        state: '状态',
+        staffName: '处理人',
+        finishTime: '完成时间'
+      },
+      audit: {
+        title: '抄送办理',
+        deductionMoney: '扣款金额',
+        deductionMoneyPlaceholder: '必填，请填写扣款金额',
+        deductionReason: '说明',
+        deductionReasonPlaceholder: '必填，请填写说明'
+      },
+      state: {
+        pending: '待处理',
+        processed: '已处理'
+      },
+      workCycle: {
+        once: '一次性工单',
+        periodic: '周期性工单'
+      },
+      message: {
+        noWorkId: '缺少工单编号',
+        loadWorkInfoError: '加载工单信息失败',
+        loadTaskItemsError: '加载任务明细失败',
+        selectItem: '请选择一个已处理的任务明细',
+        inputReason: '请输入说明',
+        inputMoney: '请输入扣款金额',
+        submitSuccess: '提交成功',
+        submitError: '提交失败'
+      }
+    }
   }
 }
 \ No newline at end of file
@@ -65,7 +65,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('editWork.attachment')">
-              <upload-file ref="uploadFile" @notifyFile="notifyFile" :defaultFiles="editWorkInfo.pathUrls" />
+              <upload-file ref="uploadFile" @notify="notifyFile" :defaultFiles="editWorkInfo.pathUrls" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -336,13 +336,15 @@ export default {
           this.editWorkInfo.endTime = dateFormat(new Date(data[0].endTime))
         }
         // 处理内容
-        this.editWorkInfo.contents = data[0].contents.map(c => ({
-          id: getUuid(),
-          content: c.content
-        })) || [{
-          id: getUuid(),
-          content: ''
-        }]
+        this.editWorkInfo.contents.forEach(c => {
+          c.id =  getUuid()
+        })
+        if (data[0].pathUrls && data[0].pathUrls.length > 0) {
+          this.editWorkInfo.pathUrls = data[0].pathUrls
+          setTimeout(() => {
+            this.$refs.uploadFile.setFilePath(data[0].pathUrls[0])
+          }, 500)
+        }
       }
     },
     async _loadTaskStaff() {
@@ -372,7 +374,7 @@ export default {
       const { data } = await listWorkCycle(params)
       if (data && data.length > 0) {
         this.editWorkInfo.period = data[0].period
-        this.editWorkInfo.workCycle = '2002' // 设置为周期工作
+        this.editWorkInfo.workCycle = data[0].workCycle // 设置为周期工作
         this.editWorkInfo.hours = data[0].hours || '24'
         // 处理月份、日期和工作日
@@ -405,6 +407,7 @@ export default {
       }
     },
     notifyFile(data) {
+      this.editWorkInfo.pathUrls = []
       this.editWorkInfo.pathUrls.push(data.realFileName)
     },
     goBack() {
@@ -273,7 +273,7 @@ export default {
           auditMessage: this.$t('workTaskDetail.processed'),
           staffId: '',
           staffName: '',
-          pathUrl: '',
+          pathUrls: '',
           itemId: '',
         }
       }
@@ -361,7 +361,8 @@ export default {
       this.workTaskDetailInfo.audit.staffName = staff.staffName
     },
     handleNotifyFile(file) {
-      this.workTaskDetailInfo.audit.pathUrl = file.realFileName
+      this.workTaskDetailInfo.audit.pathUrls = []
+      this.workTaskDetailInfo.audit.pathUrls.push(file.realFileName)
     },
     async auditSubmit() {
       try {