vue2-client 1.8.86 → 1.8.88

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.88 -2024-3-8 @张振宇**
+- XTree 可以自定义字段key了
+
+**1.8.87 -2024-3-8 @陈博辰**
+- 修改客户提供单页面, 客户可在此页面提交/退回工单
+
 **1.8.86 -2024-3-8 @张振宇**
 - 解决 STable refresh 时排序失效问题
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.86",
+  "version": "1.8.88",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XTree/XTree.vue

@@ -5,6 +5,10 @@ const props = defineProps({
   treeData: {
     type: Array,
     required: true
+  },
+  replaceFields: {
+    type: Object,
+    default: () => ({ children: 'children', title: 'title', key: 'key' })
   }
 })
 
@@ -20,6 +24,7 @@ function onSelect (keys, e) {
     <a-directory-tree
       :tree-data="props.treeData"
       @select="onSelect"
+      :replaceFields="props.replaceFields"
       :default-selected-keys="props.treeData.length > 0 ? [props.treeData[0].key] : null"
       :default-expand-all="true"
     ></a-directory-tree>

package/src/pages/system/ticket/index.vue

@@ -8,7 +8,7 @@
       title="工单状态"
       width="70%"
       @cancel="onSuccessCancel">
-      <submit-ticket-success v-if="serialNumber" :serialNumber="serialNumber" />
+      <submit-ticket-success v-if="serialNumber" :serialNumber="serialNumber" @afterSubmit="afterSubmit"/>
     </a-modal>
     <!--   两个使用手册弹框   -->
     <a-modal
@@ -237,6 +237,7 @@
         <a-tab-pane key="workHistory" tab="历史工单">
           <!--   查询表单   -->
           <x-form-table
+            ref="searchTable"
             v-if="tabActiveKey === 'workHistory'"
             :fixed-query-form="fixedQueryForm"
             serviceName="af-system"
@@ -416,6 +417,11 @@ export default {
           this.infoFormVisible = false
         }
       })
+    },
+    //  用户 退回/提交 工单回调
+    afterSubmit () {
+      this.$refs.searchTable.refreshTable()
+      this.successVisible = false
     }
   },
   watch: {

package/src/pages/system/ticket/submitTicketSuccess.vue

@@ -45,22 +45,71 @@
       </div>
     </result>
     <div class="ticket-detail">
-      <a-row class="item">
-        <a-col :span="3"><span class="title">问题描述</span></a-col>
-        <a-col :span="17"><span>{{ details.description }}</span></a-col>
-      </a-row>
-      <a-row class="item">
-        <a-col :span="3"><span class="title">问题截图</span></a-col>
-        <a-col :span="21"><image-item :images="details.images" :width="120" @preview="handleFilePreview" /></a-col>
-      </a-row>
-      <a-row v-if="details.files.length" class="item">
-        <a-col :span="3"><span class="title">附件</span></a-col>
-        <a-col :span="21"><file-item :files="details.files" :downloadable="false" @preview="handleFilePreview" /></a-col>
-      </a-row>
-      <a-row v-if="details.resultrecord" class="item">
-        <a-col :span="3"><span class="title">处理结果</span></a-col>
-        <a-col :span="17"><span>{{ details.resultrecord }}</span></a-col>
-      </a-row>
+      <a-tabs :default-active-key="tabActiveKey">
+        <a-tab-pane key="1" tab="工单问题">
+          <a-row class="item">
+            <a-col :span="3"><span class="title">问题描述</span></a-col>
+            <a-col :span="17"><span>{{ details.description }}</span></a-col>
+          </a-row>
+          <a-row class="item">
+            <a-col :span="3"><span class="title">问题截图</span></a-col>
+            <a-col :span="21"><image-item :images="details.images" :width="120" @preview="handleFilePreview" /></a-col>
+          </a-row>
+          <a-row v-if="details.files.length" class="item">
+            <a-col :span="3"><span class="title">附件</span></a-col>
+            <a-col :span="21"><file-item :files="details.files" :downloadable="false" @preview="handleFilePreview" /></a-col>
+          </a-row>
+          <a-row v-if="details.resultrecord" class="item">
+            <a-col :span="3"><span class="title">处理结果</span></a-col>
+            <a-col :span="17"><span>{{ details.resultrecord }}</span></a-col>
+          </a-row>
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="工单确认"  v-show="this.details.status === 4">
+          <a-row class="item">
+            <a-form :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
+              <!-- 是否完成 -->
+              <a-form-item label="是否完成">
+                <a-select placeholder="请选择" v-model="customerSure.sfwc">
+                  <a-select-option value="是">
+                    是
+                  </a-select-option>
+                  <a-select-option value="否">
+                    否
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+              <!-- 退回原因 -->
+              <a-form-item label="退回原因" v-show="customerSure.sfwc === '否'">
+                <a-textarea placeholder="请输入退回原因" v-model="customerSure.thyy"></a-textarea>
+              </a-form-item>
+              <!-- 售后评价 -->
+              <a-form-item label="售后评价" v-show="customerSure.sfwc === '是'">
+                <a-select placeholder="请选择" v-model="customerSure.shpj">
+                  <a-select-option value="满意">
+                    满意
+                  </a-select-option>
+                  <a-select-option value="不满意">
+                    不满意
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+              <!--     反馈意见     -->
+              <a-form-item label="反馈意见" v-show="customerSure.sfwc === '是'">
+                <a-textarea placeholder="请输入反馈意见" v-model="customerSure.fkyj"></a-textarea>
+              </a-form-item>
+              <!--     表单底部按钮     -->
+              <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
+                <a-button type="primary" @click="rollBack" :disabled="customerSure.sfwc === '是'" style="margin-right: 10px">
+                  退回
+                </a-button>
+                <a-button type="primary" @click="submit" :disabled="customerSure.sfwc === '否'">
+                  提交
+                </a-button>
+              </a-form-item>
+            </a-form>
+          </a-row>
+        </a-tab-pane>
+      </a-tabs>
     </div>
     <a-modal v-model="filePreviewVisible" :footer="null" :dialog-style="{ top: '30px' }" width="80%" :z-index="1001">
       <file-preview :path="filePath" />
@@ -121,7 +170,16 @@ export default {
       icon: true,
       // 文件预览
       filePreviewVisible: false,
-      filePath: ''
+      filePath: '',
+      tabActiveKey: '1',
+      customerSure: {
+        shpj: '满意',
+        fkyj: undefined,
+        sfwc: '是',
+        thyy: ''
+      },
+      //  工单id
+      applyId: 0
     }
   },
   mounted () {
@@ -183,6 +241,7 @@ export default {
         serialNumber: this.serialNumber
       })
         .then(res => {
+          this.applyId = res.apply_id
           this.details.uploader = res.uploader
           // 判断负责人有没有值
           if (res.name === undefined) {
@@ -216,11 +275,110 @@ export default {
     handleFilePreview (path) {
       this.filePath = path
       this.filePreviewVisible = true
+    },
+    //  用户确认提交
+    submit () {
+      return post(TicketDetailsViewApi.afterApplyFinalStepSubmit, {
+        applyId: this.applyId
+      })
+        .then(
+          res => {
+            this.onSubmit()
+            this.saveWorkflowLog('确认完工', '最后一步: 客户确认', { notes: '' })
+            this.$message.success('已完工！')
+            //  修改工单状态为 3(已关闭)
+            post(TicketDetailsViewApi.clientSubmit, {
+              status: 3,
+              serial_number: this.serialNumber
+            }).then(res => {
+              console.log('res', res)
+            })
+            this.getTicketDetail()
+            this.$emit('afterSubmit')
+          },
+          err => {
+            this.$message.error('提交失败！')
+            console.log(err)
+          }
+        )
+    },
+    //  回退
+    rollBack () {
+      if (this.customerSure.thyy === '') {
+        this.$message.warn('请填写退回原因')
+        return
+      }
+      const notes = this.customerSure.thyy
+      return post(TicketDetailsViewApi.updateApplySubState, {
+        stepId: 11,
+        applyId: this.applyId
+      }).then(
+        res => {
+          this.saveWorkflowLog('退回', '第12步: 客户确认 ---> 第11步: 售后确认', { notes })
+          this.$message.success('退回成功')
+          //  修改工单状态为 1(待处理)
+          post(TicketDetailsViewApi.clientSubmit, {
+            status: 1,
+            serial_number: this.serialNumber
+          }).then(res => {
+            console.log('res', res)
+          })
+          this.getTicketDetail()
+          this.$emit('afterSubmit')
+        },
+        err => {
+          this.$message.error('退回失败！')
+          console.log(err)
+        }
+      )
+    },
+    // 保存工作流日志
+    saveWorkflowLog (operation, desc, extra) {
+      post(TicketDetailsViewApi.saveApplyWorkflowLog, {
+        applyId: this.applyId,
+        operation,
+        desc,
+        operator: '客户确认',
+        notes: '客户确认',
+        setHandler: '客户确认',
+        setDeadline: '',
+        ...extra
+      })
+    },
+    //
+    onSubmit () {
+      const time = this.format(new Date(), 'yyyy-MM-dd hh:mm:ss')
+      const form = {
+        shpj: this.customerSure.shpj,
+        fkyj: this.customerSure.fkyj,
+        sfwc: this.customerSure.sfwc
+      }
+      return post(TicketDetailsViewApi.saveApplyStepFormData, {
+        applyId: this.applyId,
+        stepId: 12,
+        form: form,
+        data: time,
+        handler: '客户确认',
+        note: ''
+      })
+        .then(
+          res => {
+            console.log('表单提交成功')
+            this.note = ''
+            this.showForm = false
+            this.stepDone = true
+          },
+          err => {
+            this.$message.error('保存失败，请检查后重试')
+            console.log(err)
+          }
+        )
     }
   },
   computed: {
     // 用于进度条，进度显示控制
     step () {
+      console.log('status', this.details.status)
       if (this.details.status !== 0 && this.details.status !== 1) {
         return 2
       } else {

package/src/services/api/TicketDetailsViewApi.js

@@ -28,7 +28,15 @@ const TicketDetailsViewApi = {
   // 发起售后工单流程
   createTicket: '/api/af-system/logic/createTicket',
   // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
+  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName',
+  // 改变报装进度
+  updateApplySubState: '/api/af-system/logic/updateApplySubState',
+  // 保存工作流日志
+  saveApplyWorkflowLog: '/api/af-system/logic/saveApplyWorkflowLog',
+  // 完工确认后更改报装状态
+  afterApplyFinalStepSubmit: '/api/af-system/logic/afterApplyFinalStepSubmit',
+  // 保存用户每一步输入的表单内容
+  saveApplyStepFormData: '/api/af-system/logic/saveApplyStepFormData',
 }
 
 export { TicketDetailsViewApi }