.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+dist
 
 # local env files
 .env.local

TODO.md

@@ -1,61 +1,51 @@
 # 钉钉办公系统 - 待办事项
 
-## 前端 TODO
+> 最好采用 NODEJS v16.0 + 版本。 最新版会报错 [nodejs 新版本引起的：digital envelope routines::unsupported](https://blog.csdn.net/fengyuyeguirenenen/article/details/128319228)
 
-- [x] 上传文件/图片等模块
-- [x] 下载文件通过链接下载 (等待测试)
+## 前端 TODO
 
 - [ ] 路由标题配置。 通过 dingtalk Set title
 
-- [ ] 抄送人超过三个时显示状态需要更新
-
-- [ ] 我的出差-详情页面缺少 发起人字段
-
-- [ ] 商品规格页面
-
-- [ ] 商品单价页面
+- [ ] 个人中心头像和签名图片是走钉钉功能。尚未自测
+- [ ] 我的出差-同行人员需要机器测试
+- [ ] 添加/修改抄送人 - 需要机器测试
+- [ ] 申请人 用车 - 需要机器测试
+- [ ] 申请人 请假 - 需要机器测试
+- [ ] 学校文件， 前端缺少部门选择 - 需要机器测试
 
-### 缺少明细的页面
+- [x] 物品明细-Downlaod - 交互
 
-- 申购 1 - 欠缺导入功能
-- 入库 3
-- 领用（已添加 4
+  - [ ] 缺少获取链接接口
 
-## About Ui
+- [ ] 采购申请单 - 采购明细 - 可在明细详情页面下载 （缺少接口)
 
-- [ ] 个人中心`tag`Icons 需要补充
-- [ ] 个人中心头像和签名图片是走钉钉功能。 尚未自测
-- [ ] product-store icon
-- [ ] 审批详情 底部的 各种功能 ICONS 需要设计师给予
-- [ ] 审批详情 顶部 ICON 需要 设计切图
+- [ ] 附件预览
 
-## RearEnd Bugs
+## RearEnd Bugs And Todo
 
-- [ ] 批量导入接口[导入 excel 文件]缺失, 需要下载相对应的 excel 模板文件接口
-- [ ] 商品库搜索商品接口
+- [ ] 待审核的申请单是否展示。 我的 - 待处理中没记录
+- [ ] 采购单接口
+  - [ ] 缺少采购人字段
+  - [ ] 缺少商品明细。 只有 `{apply_goods: [{id, info_id, goods_name}]}`
+- [ ] 创建呈批申请时 `word_size` 字段传值但是回显失败。
+- [ ] 请假申请 开始与结束 同一天的话 提交失败 "请假结束时间必须大于开始时间"
+- [ ] 请假申请 `approveinfo/get_list` 缺失 `start/end_am`字段
 
---- 2023/12/16 ---
+- [ ] 合同呈批 - 拟稿日期 ??? keyword.
+- [ ] 重新发起 - api
+- [ ] 详情下载文档接口
+- [ ] 合同申请添加一个关联采购单 Id 的字段
 
-- [ ] 欠缺导入模板说明(采购、领用)
+--- 2023/12/25 ---
 
-## Warning
-
-- [ ] 申请详情中的 发起人流程 状态是否需要？
+- [ ] 领用申请单 - 物品明细-下载接口
+- [x] 上传 word 文件处理失败
 
 # 今日完成
 
-- [x] 申购导入模板接口调试完成
-- [x] 申购模板下载模板
-
-- [x] 领用导入模板接口调试完成
-- [x] 领用模板下载模板
-- [ ] 领用明细不需要价格 UI
-
-## 流程
-
-- [ ] 申购申请 module = 1
-- [x] 维修流程 module = 8
-- [ ] 合同呈批 module = 9
-
-- [ ] 申请人 用车
-- [ ] 申请人 请假
+- [x] Empty 状态 UI
+- [x] 明细缺少 数量修改 - 细节
+- [x] 审核流程中的明细 UI
+- [x] 审核流程中的头部 ICon。 学校
+- [x] 附件上传添加限制。 word/excel/pdf/picture.
+- [x] 申请合同呈批

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

record.md

@@ -1,11 +1,16 @@
 # 深圳市第二特殊教育学校
 
-> h5微应用
+> h5 微应用
 
 ```shell
 AgentId=2062807790
 AppKey=dingekepwoyycxfbtyvg
 AppSecret=EjM9WohvKHo3eNqZGGbQHhbjM80QzapdC_f_reYiOCyEFOtaG1qoG2KzEfpSoLWe
 sever=120.79.86.50
+```
 
-```
+```shell
+# 应用首页地址
+
+# https://dingding.hdlkeji.com
+```

src/api/approve.js

@@ -44,4 +44,10 @@ export const editApprove = data => (request({
 export const getUserApproveCount = () => (request({
     method: 'POST',
     url: 'approve/get_count',
+}))
+
+export const postFeedbackResult = data => (request({
+    data,
+    method: "POST",
+    url: "approve/feedback"
 }))

src/api/approveinfo.js

@@ -51,4 +51,11 @@ export const getUserList = data => (request({
     method: 'POST',
     url: 'approveinfo/get_user_list',
     data
-}))
+}))
+
+// 更新维修评价
+export const postEvaluate = data => (request({
+    method: 'POST',
+    url: 'approveinfo/comment',
+    data
+}))

src/api/common.js

@@ -37,3 +37,14 @@ export const getImportTemplate = data => (request({
     method: "POST",
     url: "common/get_import_template"
 }))
+
+/**
+ * 获取物业主管或者信息主管员工信息
+ * @param {Object} data {type: [1,2]} 1=物业主管,2=信息负责人  
+ * @returns Promise
+ */
+export const getMaintainData = data => (request({
+    data,
+    method: "POST",
+    url: "common/get_maintain_user"
+}))

src/components/Empty/index.vue

@@ -1,9 +1,14 @@
 <template>
     <div class="empty-container flex flex-col flex-col-aic flex-col-jcc">
         <div class="iconbox">
-            <van-icon :name="iconName" color="rgba(50, 144, 196, 1)" :size="iconSize"/>
+            <template v-if="inIconMap">
+                <van-icon :name="iconNam" color="rgba(50, 144, 196, 1)" :size="iconSize" />
+            </template>
+            <template v-else>
+                <img class="img" :src="require(`../../assets/${iconType}.png`)">
+            </template>
         </div>
-        <div class="tips">{{  tip  }}</div>
+        <div class="tips">{{ tip }}</div>
     </div>
 </template>
 
@@ -11,7 +16,7 @@
 
 // Icon类型枚举
 const TypeIconMap = {
-    'common': 'shrink'
+    'common': 'orders-o'
 }
 
 export default {
@@ -22,7 +27,7 @@ export default {
         },
         iconType: {
             type: String,
-            default: 'common'
+            default: 'approve_empty'
         },
         iconSize: {
             type: Number,
@@ -30,11 +35,15 @@ export default {
         }
     },
     computed: {
-        iconName () {
-            return TypeIconMap[this.iconType] || 'smile'
+        inIconMap() {
+            let keys = Object.keys(TypeIconMap)
+            return keys.includes(this.iconType)
+        },
+        iconNam() {
+            return TypeIconMap[this.iconType]
         }
     },
-    data () {
+    data() {
         return {
         }
     }
@@ -47,9 +56,16 @@ export default {
         height: 100%;
         padding-bottom: 50px;
         box-sizing: border-box;
+
         .iconbox {
+            text-align: center;
             margin-top: -46%;
         }
+
+        .img {
+            width: 80%;
+        }
+
         .tips {
             font-size: 14px;
             font-weight: 400;

src/main.js

@@ -14,6 +14,7 @@ import App from './App.vue'
 
 import 'amfe-flexible'
 
+new vConsole()
 if (process.env.NODE_ENV == 'development') {
   // https://www.npmjs.com/package/vconsole
   // 可以添加`options`进行配置项目

src/router/index.js

@@ -67,6 +67,24 @@ const routes = [
     component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/applyOfUser.vue')
   },
 
+  {
+    meta: {
+      title: '采购审批单'
+    },
+    path: '/applyfor/approval-form',
+    name: 'CApprovalForm',
+    component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/approval-form.vue')
+  },
+
+  {
+    meta: {
+      title: '采购物品明细'
+    },
+    path: '/applyfor/approval-form-sel',
+    name: 'CApprovalFormSel',
+    component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/approval-form-sel.vue')
+  },
+
   // NOTE：我的审核状态
   {
     path: '/apply-state',
@@ -103,6 +121,24 @@ const routes = [
     component: () => import(/* webpackChunkName: "approve" */ '../views/approve/detail.vue')
   },
 
+  {
+    meta: {
+      title: '上传返回结果',
+    },
+    path: '/approve/feedback',
+    name: 'FeedbackResult',
+    component: () => import(/* webpackChunkName: "approve" */ '../views/approve/feedback-results.vue')
+  },
+
+  {
+    meta: {
+      title: '采购明细'
+    },
+    path: '/approve/procure-info',
+    name: 'ProcureInfo',
+    component: () => import(/* webpackChunkName: "approve" */ '../views/approve/procure-info.vue')
+  },
+
 
   // ====== 我的页面
   {

src/store/modules/enum.js

@@ -46,7 +46,7 @@ const state = {
  * @returns {string}
  */
 function getKeyToTxt(arrs, id) {
-    let target = arrs.filter(row => row.id === id)
+    let target = arrs.filter(row => row.id == id)
     if (!target.length) return 'UNKNOW'
     return target[0].name
 }
@@ -65,6 +65,16 @@ const getters = {
     getMaintainText: state => id => getKeyToTxt(state.maintainTypeList, id),
     getPayTypeText: state => id => getKeyToTxt(state.applyPayTypeList, id),
     getapplyTypeText: state => id => getKeyToTxt(state.applyTypeList, id),
+    // 呈批类型
+    getOfferTypeList: state => id => getKeyToTxt(state.offerTypeList, id),
+    // 出差列表
+    getEvectionTypeList: state => id => getKeyToTxt(state.evectionTypeList, id),
+
+    // 获取出差
+    getLeaveTypeTypeList: state => id => getKeyToTxt(state.leaveTypeList, id),
+    // 获取合同
+    getContractTypeList: state => id => getKeyToTxt(state.contractTypeList, id)
+
 }
 
 const mutations = {

src/store/modules/user.js

@@ -8,17 +8,33 @@ const signatureStateEnum = ['待审核', '已通过', '已驳回']
 const state = {
     name: '',
     schoolName: '深圳市第二特殊教育学校',
+    subjectLogo: '',
     mobile: '',
     userinfo: {},
-    signatureStateText: '',  // 个签
+    signatureStateText: '', // 个签
+
+    // 徐同泽
     token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
+
+    // 于
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ5MiwibmJmIjoxNzAyNjk3NDkyLCJleHAiOjE3Mjg2MTc0OTJ9.tvPS5OIrfn21LItFuUSiKgnAUu1p-9x5xwzVzxp6y20'
+
+    // 物业主管
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzNTg5MCwibmJmIjoxNzAzMDM1ODkwLCJleHAiOjE3Mjg5NTU4OTB9.BNRfY7re51HRSjWxDObt4D-qYCkTzgCXyLupNAoAg84'
+
+    // 信息主管
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMiIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzODI1MywibmJmIjoxNzAzMDM4MjUzLCJleHAiOjE3Mjg5NTgyNTN9.eglTZ2-CPHUBDYyPbzk5k69Yv24J2ELTd8CN3VZL8_8'
+
+    // 高
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIzIiwiaXNzIjoiaHR0cHM6XC9cL3phaW4uY29tIiwiYXVkIjoiaHR0cHM6XC9cL3phaW4uY29tIiwiaWF0IjoxNzAzMTIwNTEzLCJuYmYiOjE3MDMxMjA1MTMsImV4cCI6MTcyOTA0MDUxM30.rsAbvz8U3_xIvvEZGwAjNR3WF7IXiEuK7M0I8ioaiZU'
 }
 
 const getters = {
     getTags(state){
         if (!state.userinfo.title) return []
         let title = state.userinfo.title
-        return title.split(',')
+        // NOTE: 数据库中是中文“、”
+        return title.split('、')
     },
     getDepartments (state) {
         let userinfo = state.userinfo
@@ -47,11 +63,12 @@ const getters = {
 
 const mutations = {
     UPDATE_USER_DATA: (state, payload) => {
-        const { mobile, name, subject } = payload.data
+        const { mobile, name, subject, subject_image } = payload.data
         state.userinfo = payload.data
         state.mobile = mobile
         state.name = name
         state.schoolName = subject
+        state.subjectLogo = subject_image
         state.signatureStateText = signatureStateEnum[payload.data.signature_status] || ''
     },
     // 更新用户Token

src/styles/index.less

@@ -51,6 +51,9 @@ html,body{
     &-jcsp {
        justify-content: space-between; 
     }
+    &-jcsa {
+       justify-content: space-around; 
+    }
     &-jic {
         justify-items: center;
     }

src/utils/applyfor-item.js

@@ -1,23 +1,123 @@
 /**
  * @description 设置审核Row的数据内容等
+ * 
+  // datalist: [
+  //     {
+  //         title: '审批编号',
+  //         value: '20222110741458005442684',
+  //     },
+  //     {
+  //         title: '合同编号',
+  //         value: '20222110741458005442684',
+  //         type: 'link' // 代表它是一个链接
+  //     },
+  //     {
+  //         title: '所在部门',
+  //         value: '深圳市第二特殊教育学校-教师部'
+  //     },
+  //     {
+  //         title: '申请日期',
+  //         value: '2022-11-07',
+  //         type: 'date' // 代表返回的是unixtime 时间戳需要自己转义`dayjs`
+  //     },
+  //     {
+  //         title: '申请人',
+  //         value: '刘辉'
+  //     },
+  //     {
+  //         title: '申请事由',
+  //         value: '学生生活用品购买'
+  //     },
+  //     {
+  //         title: '申购类型',
+  //         value: '货物申购',
+  //         type: 'type' // 类型字段意味着这是枚举需要自己配置 
+  //     },
+  //     {
+  //         type: 'projects',
+  //         title: '申购明细',
+  //         value: [
+  //             {
+  //                 projectName: '学生冬季校服',
+  //                 count: 20,
+  //                 tags: ['蓝色', '165cm'],
+  //                 money: 56025
+  //             },
+  //             {
+  //                 projectName: '学生冬季校服',
+  //                 count: 30,
+  //                 tags: ['蓝色', '175cm'],
+  //                 money: 65025
+  //             }
+  //         ]
+  //     },
+  //     {
+  //         title: '总金额',
+  //         value: '100000'
+  //     },
+  //     {
+  //         title: '预计申购完成日期',
+  //         value: '2022-11-08'
+  //     },
+  //     {
+  //         type: 'files', // 代表当前是 上传的文件
+  //         title: '附件材料',
+  //         value: [
+  //             {
+  //                 type: 'pdf',
+  //                 name: '采购说明.pdf',
+  //                 size: '264.45KB'
+  //             }
+  //         ]
+  //     },
+  //     {
+  //         type: 'images', // 代表当前是图片组
+  //         title: '图片',
+  //         value: [
+  //             {
+  //                 url: 'http://xxxxx'
+  //             },
+  //             {
+  //                 url: 'http://xxxxx'
+  //             },
+  //             {
+  //                 url: 'http://xxxxx'
+  //             }
+  //         ]
+  //     },
+  //     {
+  //         title: '支付方式',
+  //         value: '银行转账'
+  //     }
+  // ]
  */
 
 import store from "@/store"
-// const degree2Txt = store.getters['enum/getDegreeText']
+const degree2Txt = store.getters['enum/getDegreeText']
 const maintainTypeList = store.getters['enum/getMaintainText']
 
 const getPayTypeText = store.getters["enum/getPayTypeText"]
 const getapplyTypeText = store.getters["enum/getapplyTypeText"]
+const getOfferTypeList = store.getters["enum/getOfferTypeList"]
+const getEvectionTypeList = store.getters["enum/getEvectionTypeList"]
+const getLeaveTypeTypeList = store.getters["enum/getLeaveTypeTypeList"]
+const getContractTypeList = store.getters["enum/getContractTypeList"]
 
+// 修改明细中arrsJSON
+const formatList = arrs => (arrs.map(item => ({...item, goods_stock: JSON.parse(item.goods_stock)})))
 
-function getModule1(data){
-  const { order_no, department_data, create_at, module_info, apply_user } = data
-  // TODO: 待完成
+// 申购审批详情
+// TODO: 合同编号
+function getModule1(data){ /* eslint-disable-line */
+  const { order_no, department_data, create_at, module_info, apply_user, apply_goods } = data
+  console.log('%c ----- >>>', 'background: blue; color: #fff', formatList(apply_goods));
+  
   return [
     {
       title: '审批编号',
       value: order_no
     },
+    // TODO: 合同编号
     // 合同编号
     {
       title: '所在部门',
@@ -39,20 +139,27 @@ function getModule1(data){
       title: '申购类型',
       value: getapplyTypeText(module_info.type)
     },
-    // TODO: 待办
-    // 申购明细
+    Array.isArray(apply_goods) ? {
+      module: 1,
+      type: 'projects',
+      title: '申购明细',
+      value: formatList(apply_goods)
+    } : undefined,
     {
       title: '总金额',
-      value: module_info.total_amount
+      value: module_info.total_amount || '-'
     },
     {
       title: '预计申购完成日期',
       value: module_info.apply_date
     },
-    {
+    module_info.document_text.length ? {
+      type: 'files',
       title: '附件材料',
-      value: "@TODO"
-    },
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
     module_info.images_text.length ? {
       type: 'images',
       title: '图片',
@@ -67,7 +174,329 @@ function getModule1(data){
   ]
 }
 
-function getModule8(data) {
+// 呈批申请
+function getModule2(data){ /* eslint-disable-line */
+  const { order_no, department_data, create_at, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    {
+      title: '呈批类型',
+      value: getOfferTypeList(data.type)
+    },
+    {
+      title: '发文字号',
+      value: `${module_info.word_size}`
+    },
+    {
+      title: '缓急程度',
+      value: degree2Txt(module_info.desc)
+    },
+    {
+      title: '印制份数',
+      value: `${module_info.number}`
+    },
+    {
+      title: '申请标题',
+      value: module_info.reason
+    },
+    {
+      title: '申请内容',
+      value: module_info.remark
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+  ]
+}
+
+// 入库申请
+function getModule3(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user, stock_goods } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    Array.isArray(stock_goods) ? {
+      type: 'projects',
+      title: '物品明细',
+      value: formatList(stock_goods)
+    } : undefined,
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    module_info.images_text.length ? {
+      type: 'images',
+      title: '图片',
+      value: module_info.images_text.map(img => ({
+        url: img
+      }))
+    } : undefined,
+    {
+      title: '其他补充说明',
+      value: module_info.remark
+    }
+  ]
+}
+
+// 领用申请
+function getModule4(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user, use_goods } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    Array.isArray(use_goods) ? {
+      id: data.id,
+      module: 4,
+      type: 'projects',
+      title: '物品明细',
+      value: formatList(use_goods)
+    } : undefined,
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    module_info.remark ? {
+      title: '其他补充说明',
+      value: module_info.remark
+    } : undefined
+  ]
+}
+
+// 出差申请
+function getModule5(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    {
+      title: '出差事由',
+      value: module_info.reason
+    },
+    {
+      title: '同行人员',
+      value: Array.isArray(data.peer_user) && data.peer_user.length ? data.peer_user.map(user => (user.name)).join('、') : '暂无同行人员'
+    },
+    {
+      title: '出差开始时间',
+      value: module_info.start_time
+    },
+    {
+      title: '出差结束时间',
+      value: module_info.end_time
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    module_info.images_text.length ? {
+      type: 'images',
+      title: '图片',
+      value: module_info.images_text.map(img => ({
+        url: img
+      }))
+    } : undefined,
+    {
+      title: '出差类型',
+      value: getEvectionTypeList(module_info.type)
+    },
+    // NOTE: type === 1 show that.
+    module_info.type == 1 ? {
+      title: '是否跨关内关外',
+      value: module_info.is_who == 0 ? '否' : '是'
+    } : undefined
+  ]
+}
+
+// 请假申请
+function getModule6(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    {
+      title: '请假类型',
+      value: getLeaveTypeTypeList(module_info.type)
+    },
+    {
+      title: '请假开始时间',
+      value: `${module_info.start_time} ${module_info.start_am}`
+    },
+    {
+      title: '请假结束时间',
+      value: `${module_info.end_time} ${module_info.end_am}`
+    },
+    {
+      title: '请假时长(H)',
+      value: module_info.time
+    },
+    {
+      title: '原因',
+      value: module_info.reason
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    module_info.images_text.length ? {
+      type: 'images',
+      title: '图片',
+      value: module_info.images_text.map(img => ({
+        url: img
+      }))
+    } : undefined,
+    {
+      title: '是否离“深”',
+      value: module_info.remark
+    }
+  ]
+}
+
+// 用车申请
+function getModule7(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    {
+      title: '出发地点',
+      value: apply_user.reason
+    },
+    {
+      title: '出发时间',
+      value: apply_user.start_time
+    },
+    {
+      title: '到达地点',
+      value: apply_user.end_address
+    },
+    {
+      title: '返回时间',
+      value: apply_user.name
+    },
+    {
+      title: '返回地点',
+      value: apply_user.name
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    module_info.images_text.length ? {
+      type: 'images',
+      title: '图片',
+      value: module_info.images_text.map(img => ({
+        url: img
+      }))
+    } : undefined,
+  ]
+}
+
+// 维修申请
+function getModule8(data) { /* eslint-disable-line */
   const { order_no, department_data, module_info} = data
   return [
     {
@@ -105,20 +534,193 @@ function getModule8(data) {
   ]
 }
 
+// 合同呈批
+function getModule9(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    {
+      title: '合同类型',
+      value: getContractTypeList(module_info.type)
+    },
+    {
+      title: '合同编号',
+      value: `${apply_user.reason}`
+    },
+    {
+      title: '缓急程度',
+      value: degree2Txt(module_info.desc)
+    },
+    {
+      title: '印制份数',
+      value: `${apply_user.number}`
+    },
+    {
+      title: '发放范围',
+      value: `${apply_user.scope}`
+    },
+    {
+      title: '法务意见',
+      value: `${apply_user.legal_opinion}`
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    {
+      title: '备注',
+      value: module_info.remark
+    }
+  ]
+}
+
+// 收文批阅
+function getModule10(data) { /* eslint-disable-line */
+  const { order_no, department_data, create_at, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: create_at
+    },
+    {
+      title: '发起人',
+      value: apply_user.name
+    },
+    {
+      title: '创建人',
+      value: module_info.founder
+    },
+    {
+      title: '来文单位名称',
+      value: module_info.desc
+    },
+    {
+      title: '收文序号',
+      value: module_info.serial_number
+    },
+    {
+      title: '文件名称',
+      value: module_info.reason
+    },
+    {
+      title: '收文日期',
+      value: module_info.apply_date
+    },
+    {
+      title: '内容摘要',
+      value: module_info.remark
+    },
+    {
+      title: '缓急程度',
+      value: degree2Txt(module_info.degree)
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+  ]
+}
+
+// 学校文件  
+function getModule11(data) { /* eslint-disable-line */
+  const { order_no, department_data, module_info, apply_user } = data
+  return [
+    {
+      title: '审批编号',
+      value: order_no
+    },
+    {
+      title: '所在部门',
+      value: department_data.map(department => (department.name)).join(',')
+    },
+    {
+      title: '申请日期',
+      value: data.create_at
+    },
+    {
+      title: '申请人',
+      value: apply_user.name
+    },
+    // TODO: 拟稿部门
+    {
+      title: '拟稿部门',
+      value: apply_user.name
+    },
+    {
+      title: '文件名称',
+      value: apply_user.reason
+    },
+    // TODO: 落款
+    {
+      title: '落款',
+      value: apply_user.name
+    },
+    {
+      title: '上会情况',
+      value: apply_user.remark
+    },
+    module_info.document_text.length ? {
+      type: 'files',
+      title: '附件材料',
+      value: module_info.document_text.map(doc => ({
+        url: doc
+      }))
+    } : undefined,
+    {
+      title: '缓急程度',
+      value: degree2Txt(module_info.desc)
+    },
+    {
+      title: '拟发文时间',
+      value: apply_user.apply_date
+    },
+    {
+      title: '文件号',
+      value: apply_user.serial_number
+    },
+  ]
+}
+
 export const formatApplyforRows = (data) => {
   let type = data.module
+
   if (typeof type !== 'number') type = Number(type)
+
   let arrs = []
 
-  switch (type) {
-    case 1:
-      arrs = getModule1(data)
-      break
-    case 8:
-      arrs = getModule8(data)
-      break
-  }
-  
+  if (![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(type)) return [];
+  const moduleFunc = `getModule${type}`
+  arrs =  eval(`${moduleFunc}(data)`)
+
   // NOTE: 过滤为undefined字段
   return arrs.filter(item => (item))
 }

src/utils/approve-item.js

@@ -5,6 +5,9 @@
 import store from "@/store"
 
 const degree2Txt = store.getters['enum/getDegreeText']
+const getapplyTypeText = store.getters["enum/getapplyTypeText"]
+const getOfferTypeList = store.getters["enum/getOfferTypeList"]
+const getLeaveTypeTypeList = store.getters["enum/getLeaveTypeTypeList"]
 
 export function formatApproveItemRow(data, type) {
     if (typeof type !== 'number') type = Number(type)
@@ -20,31 +23,38 @@ export function formatApproveItemRow(data, type) {
                 },
                 {
                     label: '申购类型',
-                    val: data.type
+                    val: getapplyTypeText(data.type)
                 },
-                {
+                // 只有货物采购时才有商品列表展示
+                data.type == 1 && Array.isArray(data.apply_goods) ? {
                     label: '申购商品',
-                    val: data.apply_goods.map(goods => goods.goods_name).join(',')
-                }
+                    // 商品大于三件时 展示 xxx、xx等商品
+                    val: data.apply_goods.length > 3 ? data.apply_goods.map(goods => goods.goods_name).slice(0, 4).join(',') + '等商品' : data.apply_goods.map(goods => goods.goods_name).join(',')
+                } : undefined
             ]
             break
         case 2:
             arrs = [
                 { label: '申请标题', val: data.reason },
-                { label: '呈批类型', val: data.type },
+                { label: '呈批类型', val: getOfferTypeList(data.type) },
                 { label: '缓急程度', val: degree2Txt(data.desc) }
             ]
             break
         case 3:
             arrs = [
-                { label: '物品名称', val: '' }
-                // { label: '', val: '' },
-                // { label: '', val: '' },
+                Array.isArray(data.stock_goods) ? {
+                    label: '物品名称',
+                    // 商品大于三件时 展示 xxx、xx等商品
+                    val: data.stock_goods.length > 3 ? data.stock_goods.map(goods => goods.goods_name).slice(0, 3).join(',') + '等商品' : data.stock_goods.map(goods => goods.goods_name).join(',')
+                } : undefined
             ]
             break
         case 4:
             arrs = [
-                { label: '领用物品', val: '' },
+                Array.isArray(data.use_goods) ? {
+                    label: '物品名称',
+                    val: data.use_goods.length > 3 ? data.use_goods.map(goods => goods.goods_name).slice(0, 3).join(',') + '等商品' : data.use_goods.map(goods => goods.goods_name).join(',')
+                } : undefined,
                 { label: '物品用途', val: data.reason }
             ]
             break
@@ -66,7 +76,7 @@ export function formatApproveItemRow(data, type) {
             break
         case 6:
             arrs = [
-                { label: '请假类型', val: data.type },
+                { label: '请假类型', val: getLeaveTypeTypeList(data.type) },
                 { label: '开始时间', val: `${data.start_time} ${data.start_am}` },
                 { label: '结束时间', val: `${data.end_time} ${data.end_am}` }
             ]
@@ -87,7 +97,7 @@ export function formatApproveItemRow(data, type) {
         case 9:
             arrs = [
                 { label: '合同编号', val: data.reason },
-                { label: '拟稿日期', val: data.createTime },
+                { label: '拟稿日期', val: data.apply_date },
                 { label: '缓急程度', val: degree2Txt(data.desc) }
             ]
             break
@@ -105,5 +115,6 @@ export function formatApproveItemRow(data, type) {
             ]
             break
     }
-    return arrs
+
+    return arrs.filter(item => item)
 }

src/utils/constant.js

@@ -2,18 +2,37 @@
  * @项目常用且不可变更
  */
 
-//定义文件大小全局化
-export const FileSize = 50
-export const PicSize = 10
+//定义文件大小全局化(MB)
+export const FileSize = 80
+
+export const PicSize = 15
 
 // 手机号的基础正则
 export const phoneRegexp = /^1[0-9]{10}$/i
 
 // excel suffix
 export const excelSuffix = [
-  '.xlsx',
-  '.xls',
-  // '.xlsm',
-  // '.xlsb',
-  // '.csv',
-]
+  'xlsx',
+  'xls'
+]
+
+// word suffix
+export const wordSuffix = [
+  'word','doc','docx'
+]
+
+// pdf suffix
+export const pdfSuffix = [
+  'pdf','ppt','pptx'
+]
+
+// pic suffix
+export const pictureSuffix = [
+  'gif','icon','jpeg','jpg', 'png'
+]
+
+// 定义采购单临时存储本地字段
+export const SAVE_APPROVAL_NAME = 'TEMPORARY_APPROVAL_SAVE'
+
+// 定义采购单明细查看临时本地存储数据字段 
+export const SAVE_PROCURE_INFO_TEMPORARY = 'TEMPORARY_PROCURE_INFO_LIST'

src/utils/import-vant.js

@@ -27,12 +27,13 @@ import {
     Radio,
     RadioGroup,
     Stepper,
-    Tag
+    Tag,
+    Rate
 } from 'vant'
 
 Vue.use(Tab).use(Tabs).use(Popup).use(Toast).use(Field).use(Button).use(NavBar).use(Icon).use(Tabbar).use(TabbarItem).use(Picker)
 .use(Uploader).use(Calendar).use(DatetimePicker).use(ActionSheet).use(Switch).use(List).use(Dialog).use(Checkbox).use(Radio).use(RadioGroup).use(Stepper)
-.use(Tag)
+.use(Tag).use(Rate)
 
 
 Vue.use(ImagePreview)

src/utils/upload.js

@@ -18,9 +18,8 @@ export default function upload (file, options) {
 
         uploadFile(formData).then(result => {
             if (result.code === 1) resolve(result.data)
-            else reject(new Error(result.msg))
         }).catch(error => {
-            reject(new Error(error.msg))
+            reject(new Error(error.message))
         })
     })
 }

src/views/Approve.vue

@@ -6,7 +6,10 @@
     <div class="filter-container p-h-12 flex flex-row flex-row-aic">
       <van-field v-model="searchVal" clearable placeholder="搜索" left-icon="search" :disabled="true" :readonly="true"
         @click="handleClickSearchBox" />
-      <div class="filterbox flex flex-row flex-0shrink" @click="() => popupVisibility = true">
+      <div :class="[
+        'filterbox flex flex-row flex-0shrink',
+        hasFilter ? 'filterbox--sel' : ''
+      ]" @click="() => popupVisibility = true">
         <van-icon name="filter-o" size="20" />
         <span>筛选</span>
       </div>
@@ -14,10 +17,11 @@
     <div class="approve-main">
       <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData">
         <approve-item v-for="(item, idx) in tableData" :key="idx" approve-type="xx" :title="item.__title__"
-          :time="item.apply_date" :rows="item.__rows_item__" :person="tabVal != 3 ? item.approve_one.user.name : ''"
-          flag="approve" :flag-state="Number(tabVal)" @click="handleGoInfo(item)" />
+          :time="item.apply_date" :rows="item.__rows_item__"
+          :person="tabVal != 3 ? item.approve_one && item.approve_one.user.name : ''" flag="approve"
+          :flag-state="Number(tabVal)" @click="handleGoInfo(item)" />
       </van-list>
-      <my-empty v-show="showEmpty" tip="暂无数据" />
+      <my-empty v-show="showEmpty" icon-type="approve_empty" tip="暂无待处理的" />
     </div>
 
     <!-- 弹窗 全部筛选 -->
@@ -44,11 +48,11 @@
           </div>
           <div class="popup__rangetime__main flex flex-row flex-row-aic">
             <van-field :value="timeStart" :disabled="true" clearable placeholder="开始时间" :center="true"
-              @click-input="handleClickTimeStart" />
+              @click="handleClickTimeStart" />
             <span class="horization"></span>
 
             <van-field :value="timeEnd" :disabled="true" clearable placeholder="结束时间" :center="true"
-              @click-input="handleClickTimeEnd" />
+              @click="handleClickTimeEnd" />
           </div>
         </div>
       </div>
@@ -58,9 +62,7 @@
       </div>
 
       <ChooseTime ref="chooseTimeRef" v-model="timeStart" :min-date="minDate" :max-date="maxDate" />
-
       <ChooseTime ref="chooseTimeRef2" v-model="timeEnd" :min-date="minDate" :max-date="maxDate" />
-
     </van-popup>
   </div>
 </template>
@@ -93,7 +95,11 @@ export default {
           break
       }
       return welcomeTxt
-    }
+    },
+    // 判断是否为筛选
+    hasFilter() {
+      return this.typeVal || (this.timeStart && this.timeEnd)
+    },
   },
   data() {
     return {
@@ -159,6 +165,10 @@ export default {
       this.minDate = now
       let nowMax = new Date()
       this.maxDate = nowMax
+
+      if (this.$route.query.type_val) {
+        this.typeVal = this.$route.query.type_val
+      }
     },
     onLoadData() {
       this.__record_list__()
@@ -232,6 +242,7 @@ export default {
     // NOTE: 提交过滤搜索条件
     handleSubmitFilter() {
       this.popupVisibility = false
+      this.tableData = []
       this.onLoadData()
     },
 
@@ -255,7 +266,6 @@ export default {
 
     handleClickTimeStart() {
       const THAT = this
-      THAT.timeVal = THAT.timeStart
       this.$refs.chooseTimeRef.openChooseTime(date => {
         THAT.timeStart = dayjs(date).format('YYYY-MM-DD HH:mm')
       })
@@ -263,8 +273,7 @@ export default {
 
     handleClickTimeEnd() {
       const THAT = this
-      THAT.timeVal = THAT.timeEnd
-      this.$refs.chooseTimeRef.openChooseTime(date => {
+      this.$refs.chooseTimeRef2.openChooseTime(date => {
         THAT.timeEnd = dayjs(date).format('YYYY-MM-DD HH:mm')
       })
     },
@@ -366,6 +375,30 @@ export default {
       color: #727273;
       line-height: 22px;
     }
+
+    &--sel {
+      .van-icon.van-icon-filter-o {
+        color: #3290C4;
+      }
+
+      span {
+        color: #3290C4;
+      }
+    }
+  }
+}
+
+.filter-container .van-cell.van-field,
+.popup__rangetime__main .van-cell.van-field {
+  &::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+    background-color: transparent;
   }
 }
 

src/views/My.vue

@@ -1,12 +1,18 @@
 <template>
     <div class="personnel-center">
         <div class="setting">
+            <!-- TODO: title right btn -->
             <span @click="handleGoSetting">设置</span>
         </div>
         <!-- 个人信息 -->
         <div class="info" @click="handleGoUserInfo">
             <div class="p__avatar" v-if="userinfo">
-                <img :src="userinfo.avatar" :alt="userinfo.name">
+                <template v-if="userinfo.avatar">
+                    <img :src="userinfo.avatar" :alt="userinfo.name">
+                </template>
+                <template v-else>
+                    <span class="name">{{ userinfo.name | changeName }}</span>
+                </template>
             </div>
             <div class="p__infobox">
                 <div class="p__name">{{ username }}</div>
@@ -47,6 +53,8 @@ import { getUserApproveCount } from '@/api/approve'
 
 import { mapState, mapGetters } from 'vuex'
 
+// import { changeName } from '@utils/filter'
+
 export default {
     name: 'My',
     computed: {
@@ -143,10 +151,11 @@ export default {
 
         // NOTE: 跳转申请状态列表
         handleGoApplyOfState(row) {
+            console.log('%c ro >>>', 'background: blue; color: #fff', row);
             this.$router.push({
-                name: 'ApplyState',
+                name: 'Approve',
                 query: {
-                    type: row.module
+                    type_val: row.module
                 }
             })
         },
@@ -158,7 +167,10 @@ export default {
                 name: 'Userinfo'
             })
         },
-    }
+    },
+    // filters: {
+    //     changeName
+    // }
 }
 </script>
 
@@ -199,17 +211,28 @@ export default {
 
 .p {
     &__avatar {
+        font-size: 0;
         width: 56px;
         height: 57px;
-        width: 56px;
-        border-radius: 8px;
+        line-height: 57px;
+        // border-radius: 8px;
         overflow: hidden;
         margin-right: 15px;
+        text-align: center;
+        background-color: @main-color;
+        vertical-align: middle;
+        border-radius: 6px;
 
         img {
             width: 100%;
             height: 100%;
         }
+
+        span.name {
+            vertical-align: middle;
+            font-size: 16px;
+            color: #fff;
+        }
     }
 
     &__infobox {

src/views/apply-state/index.vue

@@ -14,10 +14,10 @@
         <div class="approve-main">
             <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData">
                 <approve-item v-for="(item, idx) in tableData" :key="idx" approve-type="xx" :title="rendeTitleCom"
-                    :time="item.apply_date" :rows="item.__rows_item__" :person="item.approve_one.user.name" flag="info"
-                    :flag-state="Number(tabVal)" @click="handleGoInfo(item)" />
+                    :time="item.apply_date" :rows="item.__rows_item__"
+                    :person="item.approve_one ? item.approve_one.user.name : ''" flag="info" :flag-state="Number(tabVal)"
+                    @click="handleGoInfo(item)" />
             </van-list>
-
             <my-empty v-show="showEmpty" tip="暂无数据" />
         </div>
 
@@ -167,6 +167,7 @@ export default {
             try {
                 let THAT = this
                 const params = {
+                    group: 'list',
                     module: this.formType,
                     status: Number(this.tabVal),
                     ...this.pagination

src/views/applyfor/ProductStore.vue

@@ -2,16 +2,31 @@
   <div class="product-store-container flex flex-col">
     <div class="product-store__header">
       <div class="search-box" v-if="type === '1'">
-        <van-field v-model="searchVal" clearable placeholder="搜索" left-icon="search" @click="handleClickSearchBox" />
+        <van-field v-model="searchVal" center placeholder="搜索" left-icon="search" @click="handleClickSearchBox">
+          <template #button>
+            <van-button size="small" @click="handleLaunchSearch" type="primary">搜索</van-button>
+          </template>
+        </van-field>
       </div>
-      <div class="sub-title">
+      <div class="sub-title flex flex-row flex-row-aic flex-row-jcsp">
         <span v-if="type === '2'">请选择商品分类</span>
         <span v-else>商品库</span>
+        <van-button v-show="searchData.length" size="small" @click="handleResetSearch" type="primary">重置搜索</van-button>
       </div>
     </div>
 
     <!-- 展示内容 -->
-    <div class="product-store__main">
+    <div class="product-store__main" v-if="searchData.length">
+      <div class="search-row" v-for="(good, idx) in searchData" :key="idx" @click="handleSelectedGoods(good)">
+        <div class="search-row__category">
+          {{ good.goods_category_first_en }}/{{ good.goods_category_en }}
+        </div>
+        <div class="search-row__title ellipsis">{{ good.goods_name }}</div>
+      </div>
+    </div>
+
+    <!-- 分类内容 -->
+    <div class="product-store__main" v-else>
       <van-radio-group v-model="radioCategory">
         <div class="row" v-for="(item, idx) in categoryData" :key="idx">
           <div class="row__header row__header--b-line flex flex-row flex-row-aic">
@@ -42,11 +57,17 @@
                 </div>
               </div>
               <div class="row__second__main" v-if="second.expand && second.childlist">
-                <div class="row__third-item flex flex-row flex-row-aic" v-for="(third, idx3) in second.childlist"
-                  :key="idx3" @click="handleSelectedGoods(third, idx3)">
-                  <span id="c1">{{ third.goods_name }}</span>
+                <div class="row__third-item flex flex-row flex-row-aic" v-for="(good, idx3) in second.childlist"
+                  :key="idx3" @click="handleSelectedGoods(good, idx3)">
+                  <span id="c1">{{ good.goods_name }}</span>
                 </div>
               </div>
+              <div class="row__second__main" v-else>
+                <div class="row__third-item flex flex-row flex-row-aic">
+                  <span id="c1">当前分类下暂无商品</span>
+                </div>
+              </div>
+
             </div>
           </div>
         </div>
@@ -54,6 +75,7 @@
     </div>
 
 
+
     <!-- 提交 -->
     <div class="btn-container" v-if="type === '2'">
       <div class="btn-span" @click="handleConfirmCategory">确定</div>
@@ -125,6 +147,11 @@
       line-height: 18px;
       padding: 10px 0;
     }
+
+    .van-button--primary {
+      background-color: @main-color;
+      border: 1px solid @main-color;
+    }
   }
 
   &__main {
@@ -206,6 +233,22 @@
 
       }
     }
+
+    .search-row {
+      padding: 10px 10px;
+      background-color: #fff;
+
+      &__category {
+        font-size: 12px;
+        color: #8d8c8c;
+        margin-bottom: 8px;
+      }
+
+      &__title {
+        font-size: 16px;
+      }
+
+    }
   }
 }
 
@@ -306,6 +349,7 @@
 
 <script>
 /**
+ * 商品库页面
  * @description 当前页面处理为多种展示格式。 
  *  - 商品单选
  *  - 分类选择
@@ -342,6 +386,7 @@ export default {
     popupVisibility: false,
     productData: [], // 弹出选择商品的数量等。
     choosedStock: null,
+    searchData: [], // 搜索数据存储列表
   }),
 
   created() {
@@ -360,15 +405,12 @@ export default {
             this.module = query.module
           }
         }
-
         await this.__queryCategoay__() // initalization query categray
       } catch (error) {
         console.log('ProductStore __init__ error', error);
       }
     },
 
-    __query_data__() { },
-
     handleClickSearchBox() { },
 
     // 点击一级
@@ -379,22 +421,22 @@ export default {
 
     // 点击二级
     async handleClickSecondRow(row) {
+      const toastInstance = this.$toast({
+        type: 'loading',
+        message: '加载数据中',
+        duration: 0
+      })
       try {
         if (!row.expand && !row.childlist) { // NOTE: 只有打开时&无子级别查询
-          const toastInstance = this.$toast({
-            type: 'loading',
-            message: '加载数据中',
-            duration: 0
-          })
           const list = await this.__queryStoreData__(row.id)
           row.childlist = [...list]
-
-          toastInstance.clear()
         }
         row.expand = !row.expand
         this.$forceUpdate()
       } catch (error) {
         this.$toast(error.message)
+      } finally {
+        toastInstance.clear()
       }
     },
 
@@ -423,7 +465,7 @@ export default {
         if (customCount <= 0) {
           return this.$toast('物品数量最少1件')
         }
-        if (customCount > ChoosedGoodsStock) {
+        if (this.module != 3 && customCount > ChoosedGoodsStock) {
           return this.$toast('当前商品规格数量不足')
         }
 
@@ -529,7 +571,69 @@ export default {
         }
       }
       this.$router.go(-1)
-    }
+    },
+
+    // NOTE: 根据id展示分类名称
+    __category_en__(good) {
+      const { goods_category_first, goods_category_id } = good
+      const temporary = {
+        goods_category_first_en: '',
+        goods_category_en: ''
+      }
+
+      let arrs = this.categoryData
+      for (let i = 0; i < arrs.length; i++) {
+        const firs = arrs[i];
+        if (firs.id === goods_category_first) {
+          for (let j = 0; j < firs.childlist.length; j++) {
+            const itm = firs.childlist[j];
+            if (itm.id === goods_category_id) {
+              temporary.goods_category_first_en = firs.name
+              temporary.goods_category_en = itm.name
+              break
+            } else continue
+          }
+        } else continue
+      }
+
+      return temporary
+    },
+    // NOTE: Search Event
+    async handleLaunchSearch() {
+      let keyword = this.searchVal
+      if (!keyword) return
+      const toastInstance = this.$toast({
+        type: 'loading',
+        message: '搜索中...',
+        duration: 0
+      })
+      try {
+        const result = await goodsApi.list({
+          search: keyword
+        })
+        if (result.code === 1) {
+          if (result.data.length) {
+            this.searchData = result.data.map(good => ({
+              ...good,
+              ...this.__category_en__(good)
+            }))
+            toastInstance.clear()
+          } else {
+            toastInstance.clear()
+            this.$toast(`暂无与${keyword}相关商品`)
+          }
+        }
+      } catch (error) {
+        toastInstance.clear()
+        console.log('%c handleLaunchSearchError >>>', 'background: blue; color: #fff', error);
+      }
+    },
+
+    // Reset search
+    handleResetSearch() {
+      this.searchData = []
+      this.searchVal = ''
+    },
   },
 
 

src/views/applyfor/approval-form-sel.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="approval-container flex flex-col flex-col-jcsp">
+    <div class="approval__header">
+      <div class="tits flex flex-row flex-row-aic flex-row-jcsp">
+        <span>入库明细</span>
+        <span class="btn" @click="isEdit = !isEdit">{{ isEdit ? '完成' : '编辑' }}</span>
+      </div>
+      <div class="line"></div>
+    </div>
+    <div class="approval__content">
+      <template v-for="(item, idx) in list">
+        <template v-for="(categor, index) in item.goods_stock">
+          <div class="item flex flex-col" :key="`${idx}-${index}`">
+            <div class="item__header flex flex-row flex-row-aic flex-row-jcsp">
+              <div class="title">{{ item.goods_name }}</div>
+              <!-- 删除当前分类商品 -->
+              <div v-show="isEdit" class="remove">
+                <span @click="handleRemoveRow(item, categor, idx, index)">删除</span>
+              </div>
+            </div>
+            <div class="item__main flex flex-row flex-row-aic flex-row-jcsp">
+              <span class="categor">{{ categor.name }}</span>
+              <van-stepper v-if="isEdit" v-model="categor.stock" :min="1" />
+              <div v-else class="count">x {{ categor.stock }}</div>
+            </div>
+          </div>
+        </template>
+      </template>
+
+    </div>
+    <div class="btn-container">
+      <div class="btn-span" @click="handleConfirmForm">确定</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { SAVE_APPROVAL_NAME } from '@/utils/constant'
+import vueBus from '@/utils/vueBus';
+
+export default {
+  name: 'CApprovalFormSel',
+  data: () => ({
+    isEdit: false, // 编辑状态
+    list: [],
+    showEmpty: false,
+    listLoading: false,
+    finished: false,
+    finishedText: '暂无更多数据了',
+    pagination: {
+      page: 1,
+      page_num: 20
+    },
+    isSelectedAll: false,
+  }),
+  created() {
+    this.__list__()
+  },
+  methods: {
+    __list__() {
+      try {
+        // TEMPORARY: 临时变量
+        const arrsx = localStorage.getItem(SAVE_APPROVAL_NAME)
+        console.log(arrsx);
+        const arrs = JSON.stringify([
+          {
+            "id": 3,
+            "goods_category_first": 1,
+            "goods_category_id": 3,
+            "goods_no": "100003",
+            "goods_name": "一次性手套丁腈橡胶",
+            "goods_brand": "万力",
+            "goods_attr": 0,
+            "weigh": 10,
+            "goods_stock": [
+              {
+                "id": 20,
+                "goods_id": 3,
+                "name": "白色",
+                "stock": 10,
+                "base_stock": 0
+              },
+              {
+                "id": 21,
+                "goods_id": 3,
+                "name": "蓝色",
+                "stock": 1000,
+                "base_stock": 0
+              }
+            ]
+          },
+          {
+            "id": 2,
+            "goods_category_first": 1,
+            "goods_category_id": 3,
+            "goods_no": "100002",
+            "goods_name": "84消毒液",
+            "goods_brand": "安其生",
+            "goods_attr": 2,
+            "weigh": 10,
+            "goods_stock": [
+              {
+                "id": 3,
+                "goods_id": 2,
+                "name": "380ml,低浓度",
+                "stock": 1000,
+                "base_stock": 0
+              },
+              {
+                "id": 4,
+                "goods_id": 2,
+                "name": "380ml,高浓度",
+                "stock": 1000,
+                "base_stock": 0
+              },
+              {
+                "id": 5,
+                "goods_id": 2,
+                "name": "600ml,低浓度",
+                "stock": 1000,
+                "base_stock": 0
+              },
+              {
+                "id": 6,
+                "goods_id": 2,
+                "name": "600ml,高浓度",
+                "stock": 1000,
+                "base_stock": 0
+              }
+            ]
+          }
+        ])
+        if (arrs) {
+          this.list = JSON.parse(arrs)
+          console.log('%c list >>>', 'background: blue; color: #fff', this.list);
+
+        }
+      } catch (error) {
+        this.$toast('请选择采购单！')
+      }
+    },
+
+    // 删除行数据
+    handleRemoveRow(item, goods, idx, index) {
+      this.$dialog.confirm({
+        message: `是否删除商品“${item.goods_name}-${goods.name}”`,
+        confirmButtonText: '确定',
+        confirmButtonColor: 'rgba(0, 122, 255, 1)',
+      }).then(() => {
+        item.goods_stock.splice(index, 1)
+        this.$forceUpdate()
+      })
+    },
+
+    // 确定入库明细
+    handleConfirmForm() {
+      this.isEdit = false
+      vueBus.$emit('listenApprovalFormList', this.list)
+      this.$router.go(-2)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.approval {
+  &-container {
+    // padding: 10px 10px 0;
+    padding-top: 10px;
+    height: 100vh;
+    box-sizing: border-box;
+  }
+
+  &__header {
+    font-size: 16px;
+    padding: 14px 12px;
+    background-color: #fff;
+
+    .tits {
+      padding-bottom: 16px;
+
+      .btn {
+        color: rgba(50, 144, 196, 1);
+      }
+    }
+
+    span {
+      margin-left: 10px;
+    }
+
+    .line {
+      height: 1px;
+      background-color: rgba(151, 151, 151, 0.3);
+
+    }
+  }
+
+  &__content {
+    height: 0;
+    flex: 1;
+    background-color: #fff;
+    overflow: auto;
+
+    .item {
+      padding: 5px 10px;
+      font-size: 14px;
+
+      &:last-child {
+        .item__main {
+          padding-bottom: 0;
+          border-bottom: initial;
+        }
+      }
+
+      &__header {
+
+        font-size: 16px;
+        line-height: 38px;
+
+        .remove {
+          font-size: 14px;
+          font-weight: 400;
+          color: #F45642;
+        }
+      }
+
+      &__main {
+        padding-bottom: 12px;
+        border-bottom: 1px solid rgba(151, 151, 151, 0.2);
+
+        .category,
+        .count {
+          font-size: 16px;
+          font-weight: 400;
+          color: #727273;
+        }
+
+        .count {
+          font-size: 14px;
+        }
+
+        /deep/.van-stepper {
+          border: 1px solid rgba(151, 151, 151, 1);
+          border-radius: 4px;
+
+          .van-stepper__input,
+          .van-stepper__minus,
+          .van-stepper__plus {
+            background-color: transparent !important;
+          }
+
+          .van-stepper__minus {
+            border-right: 1px solid rgba(151, 151, 151, 1);
+          }
+
+          .van-stepper__plus {
+            border-left: 1px solid rgba(151, 151, 151, 1);
+          }
+        }
+
+
+      }
+    }
+  }
+}
+</style>

src/views/applyfor/approval-form.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="approval-container flex flex-col flex-col-jcsp">
+    <div class="approval__header">
+      <van-icon name="circle" :class="[
+        'topcico',
+        isSelectedAll ? 'sel' : ''
+      ]" :size="18" @click="handleSelectAll">
+        <span>全选</span>
+      </van-icon>
+    </div>
+    <div class="approval__content">
+      <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData"
+        :immediate-check="false">
+
+        <template v-for="(item, idx) in list">
+          <div class="approval-item flex flex-row" :key="idx" @click="handleCheckboxItem(item, idx)">
+            <div class="checkbox">
+              <van-icon name="circle" :class="item.selected ? 'sel' : ''" :size="18">
+              </van-icon>
+            </div>
+            <div class="approval-item__main">
+              <div class="approval-item__header flex flex-row flex-row-aic">
+                <div class="hb">
+                  <div class="title">采购人</div>
+                  <div class="ctx">字段缺失</div>
+                </div>
+                <div class="hb">
+                  <div class="title">采购时间</div>
+                  <div class="ctx">{{ item.apply_date }}</div>
+                </div>
+              </div>
+              <div class="approval-item__mid">
+                <div class="hb">
+                  <div class="title">采购事由</div>
+                  <div class="ctx">{{ item.reason }}</div>
+                </div>
+              </div>
+              <div class="approval-item__mid">
+                <div class="hb">
+                  <div class="title">采购物品</div>
+                  <div class="ctx">{{ item.apply_goods | filterGoods }}</div>
+                </div>
+              </div>
+
+
+            </div>
+          </div>
+        </template>
+
+      </van-list>
+      <my-empty v-show="showEmpty" tip="暂无数据" />
+    </div>
+    <div class="btn-container">
+      <div class="btn-span" @click="handleConfirmForm">确定</div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getRecordList } from '@/api/approveinfo'
+
+import { SAVE_APPROVAL_NAME } from '@/utils/constant'
+
+export default {
+  name: 'CApprovalForm',
+  data: () => ({
+    list: [],
+    showEmpty: false,
+    listLoading: false,
+    finished: false,
+    finishedText: '暂无更多数据了',
+    pagination: {
+      page: 1,
+      page_num: 20
+    },
+    isSelectedAll: false,
+  }),
+  created() {
+    this.__list__()
+  },
+  methods: {
+    onLoadData() {
+      this.__list__()
+    },
+    async __list__() {
+      try {
+        const THAT = this
+
+        const params = {
+          ...THAT.pagination,
+          group: 'form'
+        }
+        const result = await getRecordList(params)
+        if (result.code === 1) {
+          let list = result.data || []
+          list = list.concat(list).concat(list).concat(list).concat(list)
+
+          this.listLoading = false
+
+          list = list.map(item => ({
+            ...item,
+          }))
+
+          if (list.length < THAT.pagination.page_num) THAT.finished = true
+          else {
+            THAT.pagination.page++
+          }
+
+          THAT.list = THAT.list.concat(list)
+          if (THAT.finished && !THAT.list.length) {
+            THAT.finishedText = ''
+            THAT.showEmpty = true
+          }
+        }
+      } catch (error) {
+        console.log('%c __list__ >>>', 'background: blue; color: #fff', error);
+      }
+    },
+
+    // Selecte All
+    handleSelectAll() {
+      this.isSelectedAll = !this.isSelectedAll
+      this.list = this.list.map(item => ({
+        ...item,
+        selected: this.isSelectedAll
+      }))
+    },
+
+    // Checkbox item
+    handleCheckboxItem(item, idx) {
+      this.list[idx].selected = !item.selected
+      this.$nextTick(() => {
+        let hasAll = this.list.every(item => (item.selected))
+        this.isSelectedAll = hasAll
+        this.$forceUpdate()
+      })
+    },
+
+    handleConfirmForm() {
+      let arrs = this.list.filter(item => (item.selected))
+      if (!arrs.length) return this.$toast('请选择采购单！')
+      localStorage.setItem(SAVE_APPROVAL_NAME, JSON.stringify(arrs))
+
+      this.$router.push({
+        name: 'CApprovalFormSel',
+        // query: {}
+      })
+    }
+
+  },
+  filters: {
+    filterGoods(goods) {
+      if (!Array.isArray(goods)) return '/'
+      if (!goods.length) return '/'
+      return goods.map(good => (good.goods_name)).join('、')
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.approval {
+  &-container {
+    padding-top: 10px;
+    height: 100vh;
+    box-sizing: border-box;
+  }
+
+  &__header {
+    background-color: #fff;
+    font-size: 16px;
+    padding: 14px 12px;
+    border-bottom: 1px solid rgba(151, 151, 151, 0.3);
+
+    span {
+      margin-left: 10px;
+    }
+  }
+
+  &__content {
+    height: 0;
+    flex: 1;
+    background-color: #fff;
+    overflow: auto;
+  }
+}
+
+.approval-item {
+  padding: 0 0 10px 10px;
+
+  &:first-child {
+    .approval-item__main {
+      border-top: none;
+    }
+  }
+
+  .checkbox {
+    width: 60px;
+    text-align: center;
+  }
+
+  &__main {
+    width: 0;
+    flex: 1;
+    padding-top: 15px;
+    border-top: 1px solid rgba(151, 151, 151, 0.3);
+
+    .hb {
+      font-size: 0;
+
+      .title {
+        font-size: 12px;
+        font-weight: 400;
+        color: #727273;
+        line-height: 18px;
+      }
+
+      .ctx {
+        font-size: 16px;
+        font-weight: 400;
+        color: #191A1E;
+        line-height: 24px;
+      }
+    }
+  }
+
+  &__header {
+    justify-content: space-between;
+    padding-right: 20px;
+    padding-bottom: 15px;
+  }
+
+  &__mid {
+    padding-right: 20px;
+    padding-bottom: 15px;
+  }
+}
+
+// circle box
+.van-icon.van-icon-circle {
+  position: relative;
+  z-index: 1;
+  color: rgba(200, 200, 201, 1);
+
+  &.sel {
+    color: rgba(50, 144, 196, 1);
+
+    &::after {
+      position: absolute;
+      left: 50%;
+      top: 52%;
+      content: "";
+      width: 11px;
+      height: 11px;
+      transform: translate(-50%, -50%);
+      background-color: rgba(50, 144, 196, 1);
+      border-radius: 10px;
+    }
+  }
+
+  &.topcico {
+    &::after {
+      left: 14%;
+    }
+  }
+}
+</style>

src/views/applyfor/components/CFiles.vue

@@ -15,15 +15,10 @@
             <ul class="files-container">
                 <li class="files-row flex flex-row flex-row-aic" v-for="(file, index) in filelist" :key="index">
                     <div class="icon">
-                        <template v-if="['png', 'jpg', 'jpeg'].includes(file.type)">
-                            <span>pic</span>
-                        </template>
-                        <span v-else-if="file.type === 'word'">word</span>
-                        <span v-else-if="file.type === 'pdf'">pdf</span>
-                        <span v-else-if="['xsl'].includes(file.type)">表格</span>
+                        <img :src="handleGetFileImgPath(file.type)" alt="">
                     </div>
                     <div class="files-row__info">
-                        <div class="files-name ellipsis">{{ file.name }}</div>
+                        <div class="files-name ellipsis">{{ file.type }}{{ file.name }}</div>
                         <div class="files-other-info flex flex-row flex-row-aic">
                             <div class="files-other-info__div flex flex-row">
                                 <div class="size">{{ file.size }}</div>
@@ -78,10 +73,13 @@
             }
 
             .icon {
-                width: 35px;
-                height: 42px;
-                background: #FFCF95;
+                width: 40px;
+                height: 40px;
                 margin-right: 12px;
+
+                img {
+                    width: 100%;
+                }
             }
 
             &__info {
@@ -131,7 +129,8 @@ import {
 
 import {
     FileSize,
-    PicSize
+    PicSize,
+    excelSuffix, wordSuffix, pdfSuffix, pictureSuffix
 } from "@/utils/constant"
 
 export default {
@@ -150,11 +149,14 @@ export default {
             return this.ctype === 'files'
         },
         acceptHandle() { // 图片上传文件限制
-            return this.isFs ? "*" : "image/*"
+            return this.isFs ?
+                [...wordSuffix, ...pdfSuffix, ...excelSuffix, ...pictureSuffix].map(s => (`.${s}`)).join(',')
+                : pictureSuffix.map(s => (`.${s}`)).join(',')
         },
         headerTitle() {
             return this.isFs ? '附件' : '图片'
         },
+
         // 文件大小
         maxSizeComp() {
             let mb = 1 * 1024 * 1024;
@@ -164,6 +166,10 @@ export default {
 
     data() {
         return {
+            excelSuffix,
+            wordSuffix,
+            pdfSuffix,
+            pictureSuffix,
             toastInstance: null,
             filelist: []
         }
@@ -174,22 +180,40 @@ export default {
     },
 
     methods: {
+        // NOTE: 根据类型获取图片链接
+        handleGetFileImgPath(type) {
+            if (pictureSuffix.includes(type)) return require("../../../assets/icon-pic.png")
+            else if (wordSuffix.includes(type)) return require("../../../assets/icon-word.png")
+            else if (pdfSuffix.includes(type)) return require("../../../assets/icon-pdf.png")
+            else if (excelSuffix.includes(type)) return require("../../../assets/icon-excel.png")
+            return ""
+        },
+
         handleUpdateValues() {
             const arrs = this.value
             if (Array.isArray(arrs) && arrs.length) this.filelist = [...arrs]
         },
+
         // 启动上传组件
         handleLaunchUploadBox() {
             this.$refs.uploadFileRef.chooseFile()
         },
 
         // @returns Boolean {true/false}
-        beforeRead() {
+        beforeRead(file) {
             this.toastInstance = this.$toast.loading({
                 duration: 0,
                 message: '上传中'
             })
+
             // NOTE: 上传前的控制
+
+            // 文件大小 = 0 禁止上传
+            if (file.size <= 0) {
+                this.$toast('上传文件，文件尚未编辑！')
+                return false
+            }
+
             return true
         },
 
@@ -203,14 +227,20 @@ export default {
                 file.type = suffix
                 file.url = url
                 file.size = getByteShowSize(file.file.size)
-                file.status = 'success'
+                file.status = 'done'
                 this.$forceUpdate() // 强制更新渲染视图
+
+                this.toastInstance.clear()
             } catch (error) {
+
                 file.status = 'failed'
                 file.message = error.message
-            } finally {
+
+                this.filelist.splice(detail.index, 1)
                 this.toastInstance.clear()
+                this.$toast(error.message)
             }
+
         },
 
         // 超出文件大小

src/views/applyfor/components/CFlowPath.vue

@@ -38,7 +38,7 @@
             </div>
 
             <!-- 抄送人 -->
-            <div class="rows">
+            <div class="rows" v-if="copySelList.length || isAllowCopy == '1'">
                 <div class="left">
                     <div class="left__title">
                         抄送人
@@ -48,7 +48,7 @@
                     </div>
                 </div>
                 <div class="right flex flex-row">
-                    <div v-if="copySelList.length" class="procesbox flex flex-row flex-row-aic">
+                    <div class="procesbox flex flex-row flex-row-aic">
                         <div class="flex flex-row" v-if="copySelList.length > 3" @click="showMoreCopy = true">
                             <div class="personal flex flex-col">
                                 <div class="avatar avatar--name">
@@ -344,18 +344,28 @@ export default {
             this.copySelList.splice(idx, 1)
 
             // TODO: Update copy data.
-        }
+        },
+
+
+        __render_a__(arrs) {
+            if (!Array.isArray(arrs)) arrs = this.approve
+            this.approveSelList = [...arrs]
+        },
+        __render_c__(arrs) {
+            if (!Array.isArray(arrs)) arrs = this.copy
+            this.copySelList = [...arrs]
+        },
     },
     watch: {
         approve: {
             handler(arrs) {
-                if (arrs.length) this.approveSelList = [...arrs]
+                this.__render_a__(arrs)
             },
             deep: true,
         },
         copy: {
             handler(arrs) {
-                if (arrs.length) this.copySelList = [...arrs]
+                this.__render_c__(arrs)
             },
             deep: true
         }

src/views/applyfor/components/CInput.vue

@@ -1,22 +1,11 @@
 <template>
-    <layout
-        :title="$attrs.title"
-        :required="$attrs.required"
-    >
+    <layout :title="$attrs.title" :required="$attrs.required">
         <div class="custom-input-container flex flex-row flex-row-aic">
-            <van-field
-                class="input-padding"
-                :value="value"
-                :type="inputType"
-                :placeholder="$attrs.placeholder || '请输入'"
-                @input="value => $emit('input', value)"
-                @clear="() => $emit('input', '')"
-                clearable
+            <van-field class="input-padding" :value="value" :type="inputType" :placeholder="$attrs.placeholder || '请输入'"
+                @input="value => $emit('input', value)" @clear="() => $emit('input', '')" clearable
                 :maxlength="$attrs.maxlength || undefined"
-                :show-word-limit="typeof $attrs.showWordLimit === 'undefined' ? true : $attrs.showWordLimit"
-                rows="3"
-                autosize
-            />
+                :show-word-limit="typeof $attrs.showWordLimit === 'undefined' ? true : $attrs.showWordLimit" rows="3"
+                autosize :readonly="$attrs.readonly || false" />
         </div>
     </layout>
 </template>

src/views/applyfor/components/CProductStore.vue

@@ -341,25 +341,34 @@ export default {
 
     handleUpdateValues() {
       const arrs = this.value
-      if (Array.isArray(arrs) && arrs.length) this.list = [...arrs]
+      if (Array.isArray(arrs)) this.list = [...arrs]
     },
 
     // NOTE: 处理新增和修改商品
     // 更新  flag = 3。 新增 flag = 1
     handleAddOrUpdateData(data) {
       if (!data) return
-      console.log('%c handle AddOrUpdate data >>>', 'background: blue; color: #fff', data);
-
       const { flag } = data
-      if (flag === '3') { // update
-        // NOTE: 可能存在新商品无Id情况； 要兼容
-        const hasGoodsId = Boolean(data.goods_id)
-        if (!hasGoodsId) data.flag = '1'
-        let idx = this.list.findIndex(goods => hasGoodsId ? goods.goods_id === data.goods_id : goods.__id__ === data.__id__)
-        if (idx >= 0) this.list.splice(idx, 1, { ...data })
+      // NOTE: 可能存在新商品无Id情况； 要兼容
+      const hasGoodsId = Boolean(data.goods_id)
+
+      let idx = this.list.findIndex(goods => hasGoodsId ? goods.goods_id === data.goods_id : goods.__id__ === data.__id__)
+
+      console.log('handleAddOrUpdateData', flag, data, this.list, idx);
+      if (idx >= 0) { // 说明是存在列表的产品
+        // if (!hasGoodsId) data.flag = '1'
+        this.list.splice(idx, 1, { ...data })
       } else { // add
         this.list.push({ ...data })
       }
+
+      // if (flag == '3') { // update
+      //   if (!hasGoodsId) data.flag = '1'
+      //   let idx = this.list.findIndex(goods => hasGoodsId ? goods.goods_id === data.goods_id : goods.__id__ === data.__id__)
+      //   if (idx >= 0) this.list.splice(idx, 1, { ...data })
+      // } else { // add
+      //   
+      // }
     },
 
     // NOTE: 商品库选择数据
@@ -408,7 +417,6 @@ export default {
             }
           ]
         }
-        console.log('%c printlog >>>', 'background: blue; color: #fff', _template_);
         this.list = [...this.list, _template_]
       }
     },
@@ -485,7 +493,7 @@ export default {
 
     },
 
-    // NOTE: 下载批量导入说明
+    // XXX: 下载批量导入说明
     // Useless. 功能忽略
     handleDownloadHelp() {
       // util/downloadFileUseATarget
@@ -495,7 +503,7 @@ export default {
     // NOTE: 提醒某某商品库存不足。让用户选择是否申领/采购
     handleTipsImport(errs, arrs) {
       this.$dialog.confirm({
-        message: errs.map((item, idx) => `${idx + 1}、${item.msg}}`).join('\t\n'),
+        message: errs.map((item, idx) => `${idx + 1}、${item.msg}`).join('\t\n'),
         confirmButtonText: '取消申领',
         confirmButtonColor: 'rgba(0, 122, 255, 1)',
         cancelButtonText: '按已有的库存申领'
@@ -533,6 +541,7 @@ export default {
           name: 'Goods',
           query: {
             flag: '3',
+            type: this.type,
             edit: JSON.stringify(item)
           }
         })
@@ -551,17 +560,23 @@ export default {
 
     // NOTE: 添加新商品
     handleAddGoods() {
+      // 添加路由缓存
       this.$store.commit({
         type: "app/ROUTE_ADD",
         value: "Goods"
       })
+
       this.$nextTick(() => {
         this.$router.push({
-          name: 'Goods'
+          name: 'Goods',
+          query: {
+            type: this.type
+          }
         })
       })
     }
   },
+
   filters: {
     // NOTE: 累加器
     sumPrice(arrs) {

src/views/applyfor/components/CSelectImitate.vue

@@ -5,7 +5,7 @@
                 <div v-if="value" class="value">{{ value }}</div>
                 <div v-else class="default">{{ placeholder }}</div>
             </div>
-            <div class="right">
+            <div class="right" v-if="hideRemove ? false : true">
                 <van-icon v-if="value" :size="20" color="#A2A3A4" name="clear" @click="$emit('clear')" />
                 <van-icon color="#A2A3A4" :size="20" name="arrow" @click="$emit('click')" />
             </div>
@@ -20,6 +20,7 @@
 import Layout from './Layout.vue';
 export default {
     name: 'CSelectImitate',
+
     components: {
         Layout
     },
@@ -32,12 +33,12 @@ export default {
         placeholder: {
             type: String,
             default: '请选择'
+        },
+        hideRemove: {
+            type: Boolean,
+            default: false
         }
-    },
-
-    data: () => ({
-
-    })
+    }
 }
 </script>
 

src/views/applyfor/components/IndexType1.vue

@@ -13,7 +13,7 @@
             <c-product-store ref="productStoreRef" v-model="apply_goods" type="1" />
         </template>
 
-        <c-input title="总金额（元）" :required="true" v-model="total_amount" />
+        <c-input title="总金额（元）" :required="true" input-type="number" v-model="total_amount" />
 
         <c-date title="预计申购完成日期" v-model="apply_date" />
 
@@ -128,18 +128,18 @@ export default {
                 goods_stock: JSON.parse(goods.goods_stock)
             }))
 
-            if (data.module_info.images) {
+            if (Array.isArray(data.module_info.images_text) && data.module_info.images_text.length) {
                 this.images = data.module_info.images_text.map(img => ({
                     url: img
                 }))
             }
 
-            // TODO: document
-            // if (data.module_info.document_text) {
-            //     this.images = data.module_info.document_text.map(doc => ({
-            //         url: doc
-            //     }))
-            // }
+            if (Array.isArray(data.module_info.document_text) && data.module_info.document_text.length) {
+                this.images = data.module_info.document_text.map(doc => ({
+                    url: doc
+                }))
+            }
+
             // NOTE: 主动触发子组件渲染
             this.$nextTick(() => {
                 this.$refs.productStoreRef.handleUpdateValues()
@@ -197,7 +197,7 @@ export default {
             let requiredKey = [
                 'reason',
                 'type',
-                'apply_goods',
+                // 'apply_goods',
                 'total_amount',
                 'pay_type'
             ]
@@ -205,6 +205,13 @@ export default {
                 mapTxt,
                 requiredKey,
                 data
+            }, (data, hasEmpty, hasKey) => {
+                // 判断当type == 1 市内出差时。 判断是否出境
+                if (data.type == 1 && !(Array.isArray(data.apply_goods) && data.apply_goods.length)) {
+                    hasEmpty = true
+                    hasKey = 'apply_goods'
+                }
+                return [hasEmpty, hasKey]
             })
         },
 

src/views/applyfor/components/IndexType10.vue

@@ -1,55 +1,19 @@
 <template>
     <div class="type6-container">
-        <c-input
-            title="创建人"
-            v-model="founder"
-        />
-
-        <c-input
-            title="来文单位名称"
-            :required="true"
-            v-model="desc"
-        />
-        <c-input
-            title="收文序号"
-            :required="true"
-            v-model="serial_number"
-        />
-        <c-input
-            title="文件名称"
-            v-model="reason"
-        />
-        <c-date 
-            title="收文日期"
-            :required="true"
-            v-model="apply_date"
-        />
-        <c-input
-            title="内容摘要"
-            :required="true"
-            input-type="textarea"
-            v-model="remark"
-        />
-
-        <c-select
-            title="缓急程度"
-            :required="true"
-            :list="degreeList"
-            pickerValueKey="name"
-            pickerValueId="id"
-            v-model="degree"
-        />
-
-        <c-files
-            ctype="files"
-            v-model="document"
-        />
-
-        <c-flow-path
-            :approve="approvePeople"
-            :copy="copyPeople"
-            :isAllowCopy="isCopy"
-        />
+        <c-input title="创建人" v-model="founder" />
+
+        <c-input title="来文单位名称" :required="true" v-model="desc" />
+        <c-input title="收文序号" :required="true" v-model="serial_number" />
+        <c-input title="文件名称" v-model="reason" />
+        <c-date title="收文日期" :required="true" v-model="apply_date" />
+        <c-input title="内容摘要" :required="true" input-type="textarea" v-model="remark" />
+
+        <c-select title="缓急程度" :required="true" :list="degreeList" pickerValueKey="name" pickerValueId="id"
+            v-model="degree" />
+
+        <c-files ctype="files" v-model="document" />
+
+        <c-flow-path :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
 
     </div>
 </template>
@@ -71,12 +35,13 @@ export default {
     mixins: [
         indexMixin
     ],
-    data () {
+    data() {
         return {
             postApi: null,
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 10,
             reason: '', // 文件名称
@@ -94,20 +59,20 @@ export default {
         }
     },
 
-    created () {
+    created() {
         this.getCommonFlowPathData()
         this.postApi = this.flag === 'approve' ? editApprove : postCreateInfo
     },
 
     methods: {
         // 获取编辑数据
-        handleFormatEditData (data) {
+        handleFormatEditData(data) {
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
         },
         /**
          * @description 提交数据默认函数
          */
-         handleSubmitData () {
+        handleSubmitData() {
             let formData = this.__format_data__()
             console.log('format data>>>', formData);
             let bol = this.validate(formData)
@@ -115,8 +80,9 @@ export default {
             console.log('execute handleSubmitData', formData);
             this.__post__(formData)
         },
-        __format_data__ () {
+        __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 desc: this.desc,
@@ -130,13 +96,15 @@ export default {
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
         },
-        validate (data) {
+        validate(data) {
             let mapTxt = {
                 'desc': '来文单位名称',
                 'serial_number': '收文序号',
@@ -155,24 +123,16 @@ export default {
                 data
             })
         },
-        async __post__ (data) {
+        async __post__(data) {
             try {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
-            } catch(e) {
+            } catch (e) {
                 console.log('it5, __post__', e);
             }
         },

src/views/applyfor/components/IndexType11.vue

@@ -45,6 +45,7 @@ export default {
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 11,
             reason: '', // 文件名称
@@ -85,6 +86,7 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
 
                 reason: this.reason,
@@ -99,8 +101,10 @@ export default {
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
@@ -133,17 +137,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);

src/views/applyfor/components/IndexType2.vue

@@ -1,6 +1,10 @@
 <template>
     <div class="type6-container">
-        <c-input title="呈批类型" :required="true" v-model="type" />
+        <div class="btn-container" @click="handleNavRightBack">
+            <div class="btn-span">我的呈批</div>
+        </div>
+
+        <c-select title="呈批类型" :required="true" v-model="type" :list="offerList" pickerValueKey="name" pickerValueId="id" />
 
         <c-input title="发文字号" :required="true" v-model="word_size" />
 
@@ -16,13 +20,11 @@
         <c-files v-model="document" />
 
         <c-flow-path :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
-
     </div>
 </template>
 
-<style lang="less" scoped></style>
-
 <script>
+
 /**
  * @description 呈批申请页面
  */
@@ -30,45 +32,72 @@
 import indexMixin from '../indexMixins'
 import { postCreateInfo } from '@/api/approveinfo'
 import { editApprove } from '@/api/approve'
-
+import { settingNavigationRight, settingNavigationTitle } from '@/utils/dingtalk';
 
 export default {
     name: 'IndexType2',
     mixins: [
         indexMixin
     ],
-    data() {
-        return {
-            postApi: null,
-            degreeList: this.$store.state.enum.degreeList,
-
-            // formData start
-            id: '',
-            module: 2,
-            reason: '', // 申请标题
-            type: '', // 呈批类型
-            desc: '', // 缓急程度
-            document: [], // 附件
-            remark: '', // 申请内容
-            word_size: '', // 发文字号
-            number: '', // 印制份数
-
-            approve_user: [],
-            copy_user: []
-            // formData end
-        }
-    },
-
+    data: () => ({
+        postApi: null,
+        degreeList: [],
+        offerList: [],
+
+        // formData start
+        way: 'create', // create/update/edit
+        id: '',
+        module: 2,
+        reason: '', // 申请标题
+        type: '', // 呈批类型
+        desc: '', // 缓急程度
+        remark: '', // 申请内容
+        word_size: '', // 发文字号
+        number: '', // 印制份数
+        document: [], // 附件
+
+        approve_user: [],
+        copy_user: []
+        // formData end
+    }),
     created() {
+        // SetList
+        this.degreeList = this.$store.state.enum.degreeList
+        this.offerList = this.$store.state.enum.offerTypeList
+
         this.getCommonFlowPathData()
+
         this.postApi = this.flag === 'approve' ? editApprove : postCreateInfo
     },
-
     methods: {
+
+        // NOTE: 设置标题等
+        navigationSetting() {
+            settingNavigationTitle({
+                title: '出差申请'
+            })
+            settingNavigationRight({
+                show: true,
+                control: true,
+                text: '我的出差',
+                callback: this.handleNavRightBack
+            })
+        },
+        handleNavRightBack(result) {
+            console.log('result', result);
+            this.$router.push({
+                name: 'ApplyState',
+                query: {
+                    type: this.module,
+                }
+            })
+        },
+
         // 获取编辑数据
         handleFormatEditData(data) {
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
         },
+
         /**
          * @description 提交数据默认函数
          */
@@ -80,8 +109,10 @@ export default {
             console.log('execute handleSubmitData', formData);
             this.__post__(formData)
         },
+
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 type: this.type,
@@ -89,17 +120,20 @@ export default {
                 remark: this.remark,
                 word_size: this.word_size,
                 number: this.number,
-
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
+            let documents = this.document
+
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
         },
+
         validate(data) {
             let mapTxt = {
                 'type': '呈批类型',
@@ -124,15 +158,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it2, __post__', e);
@@ -141,4 +169,4 @@ export default {
     },
 }
 
-</script>
+</script>

src/views/applyfor/components/IndexType3.vue

@@ -1,11 +1,13 @@
 <template>
     <div class="type6-container">
+        <div class="btn-container" @click="handleNavRightBack">
+            <div class="btn-span">我的</div>
+        </div>
 
-        <!-- TODO: 关联采购审批单 -->
-        <!-- 需要新增页面 -->
-        <c-select title="采购审批单" />
+        <!-- <c-select title="采购审批单" /> -->
+        <c-select-imitate title="采购审批单" :value="selOrd_text" @click="handleClickSelOrdRow" @clear="handleCloseSelOrd" />
 
-        <c-product-store type="3" />
+        <c-product-store ref="cproductstoreRef" type="3" v-model="stock_goods" />
 
         <c-files v-model="document" />
 
@@ -18,8 +20,6 @@
     </div>
 </template>
 
-<style lang="less" scoped></style>
-
 <script>
 /**
  * @description 入库申请 页面
@@ -29,9 +29,9 @@ import indexMixin from '../indexMixins'
 import { postCreateInfo } from '@/api/approveinfo'
 import { editApprove } from '@/api/approve'
 
-
 import CProductStore from './CProductStore.vue'
 
+import vueBus from '@/utils/vueBus'
 
 export default {
     name: 'IndexType3',
@@ -41,36 +41,106 @@ export default {
     components: {
         CProductStore
     },
+    computed: {
+        selOrd_text() {
+            if (this.selOrd_arrs.length) return '已设置'
+            return ''
+        },
+    },
     data() {
         return {
             postApi: null,
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 3,
             document: [], // 附件
             images: [],
             remark: '', // 其他补充说明
 
-            selOrd: '', // 关联审批单
-            libraryInfo: [], // 入库明细
+            // selOrd: '', // 关联审批单
+            stock_goods: [], // 入库明细
 
             approve_user: [],
-            copy_user: []
+            copy_user: [],
             // formData end
+            selOrd_arrs: [],
         }
     },
 
     created() {
         this.getCommonFlowPathData()
         this.postApi = this.flag === 'approve' ? editApprove : postCreateInfo
+        vueBus.$on('listenApprovalFormList', this.handleApprovalFormList)
     },
 
     methods: {
+        // NOTE: 设置标题等
+        navigationSetting() {
+            // settingNavigationTitle({
+            //     title: '维修申请'
+            // })
+
+            // settingNavigationRight({
+            //     show: true,
+            //     control: true,
+            //     text: '我的出差',
+            //     callback: this.handleNavRightBack
+            // })
+        },
+        handleNavRightBack(result) {
+            console.log('result', result);
+            this.$router.push({
+                name: 'ApplyState',
+                query: {
+                    type: this.module
+                }
+            })
+        },
+        // 监听 `vueBus.$on` `listenApprovalFormList`
+        handleApprovalFormList(arrs) {
+            // NOTE: 新增商品时 需要定义一个 `__id__` 字段
+            arrs = arrs.map((item, idx) => ({
+                ...item,
+                flag: 1,
+                __id__: `${Date.now()}-${idx}`
+            }))
+
+            this.selOrd_arrs = [...arrs]
+
+            this.$nextTick(() => {
+                console.log('----', this.selOrd_arrs);
+                arrs.forEach(item => {
+                    this.$refs.cproductstoreRef.handleAddOrUpdateData(item)
+                })
+            })
+        },
         // 获取编辑数据
         handleFormatEditData(data) {
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
+
+            const IS_EDIT = this.flag === 'approve'
+            this.way = IS_EDIT ? 'edit' : 'update'
+            this.id = IS_EDIT ? data.approve_id : data.id
+            this.module = data.module
+
+            if (Array.isArray(data.module_info.images_text) && data.module_info.images_text.length) {
+                this.images = data.module_info.images_text.map(img => ({
+                    url: img
+                }))
+            }
+
+            if (Array.isArray(data.module_info.document_text) && data.module_info.document_text.length) {
+                this.images = data.module_info.document_text.map(doc => ({
+                    url: doc
+                }))
+            }
+
+            this.selOrd = data.selOrd
+            this.remark = data.remark
+            this.stock_goods = data.stock_goods || []
         },
         /**
          * @description 提交数据默认函数
@@ -85,29 +155,36 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
 
-                selOrd: this.selOrd,
+                // selOrd: this.selOrd,
                 remark: this.remark,
-                libraryInfo: this.libraryInfo,
+                stock_goods: this.stock_goods,
 
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
-            // images
+            let images = this.images
+            if (Array.isArray(images) && images.length) {
+                templateObj.images = images.map(image => image.url).join(',')
+            }
+
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
         },
         validate(data) {
             let mapTxt = {
-                'libraryInfo': '入库明细'
+                'stock_goods': '入库明细'
             }
             let requiredKey = [
-                'libraryInfo'
+                'stock_goods'
             ]
             return this.__validtor__({
                 mapTxt,
@@ -120,23 +197,47 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);
             }
         },
+
+        handleClickSelOrdRow() {
+            this.$router.push({
+                name: 'CApprovalForm',
+                query: {}
+            })
+        },
+        handleCloseSelOrd() {
+            try {
+                let stock_goods = [...this.stock_goods]
+                this.selOrd_arrs.forEach(item => {
+                    const { __id__ } = item
+                    let idx = stock_goods.findIndex(item => item.__id__ === __id__)
+                    if (idx >= 0) {
+                        stock_goods.splice(idx, 1)
+                    }
+                })
+
+                this.stock_goods = [...stock_goods]
+                this.$forceUpdate()
+                this.$nextTick(() => {
+                    this.selOrd_arrs = []
+                    this.$refs.cproductstoreRef.handleUpdateValues()
+                })
+            } catch (error) {
+                console.log('%c handleCloseSelOrd >>>', 'background: blue; color: #fff', error);
+            }
+        }
     },
+
+    beforeDestroy() {
+        vueBus.$off('listenApprovalFormList', this.handleApprovalFormList)
+    }
 }
 
 </script>

src/views/applyfor/components/IndexType4.vue

@@ -1,8 +1,12 @@
 <template>
     <div class="type6-container">
+        <div class="btn-container" @click="handleNavRightBack">
+            <div class="btn-span">我的</div>
+        </div>
+
         <c-input title="物品用途" v-model="reason" />
 
-        <c-product-store type="4" />
+        <c-product-store type="4" v-model="use_goods" />
 
         <c-files ctype="files" v-model="document" />
 
@@ -41,13 +45,14 @@ export default {
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 4,
             reason: '', // 物品用途
             document: [], // 附件
             remark: '', // 补充说明
 
-            use_goods: '', // 明细
+            use_goods: [], // 明细
 
             approve_user: [],
             copy_user: []
@@ -61,6 +66,28 @@ export default {
     },
 
     methods: {
+        // NOTE: 设置标题等
+        navigationSetting() {
+            // settingNavigationTitle({
+            //     title: '维修申请'
+            // })
+
+            // settingNavigationRight({
+            //     show: true,
+            //     control: true,
+            //     text: '我的出差',
+            //     callback: this.handleNavRightBack
+            // })
+        },
+        handleNavRightBack(result) {
+            console.log('result', result);
+            this.$router.push({
+                name: 'ApplyState',
+                query: {
+                    type: this.module
+                }
+            })
+        },
         // 获取编辑数据
         handleFormatEditData(data) {
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
@@ -78,17 +105,19 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 remark: this.remark,
                 use_goods: this.use_goods,
-
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
             // document
+            if (this.document.length) {
+                templateObj.document = this.document.map(doc => doc.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
@@ -111,17 +140,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);

src/views/applyfor/components/IndexType5.vue

@@ -4,6 +4,8 @@
             <div class="btn-span">我的出差</div>
         </div>
 
+        <c-select-imitate title="申请人" :value="apply_user_name" />
+
         <c-input title="填写事由" :required="true" v-model="reason" />
 
         <peers v-model="peer_user" />
@@ -39,6 +41,7 @@ import Peers from './Peers.vue';
 import indexMixin from '../indexMixins'
 
 import { settingNavigationRight, settingNavigationTitle } from '@/utils/dingtalk';
+import { mapState } from 'vuex'
 
 export default {
     name: 'IndexType5',
@@ -49,7 +52,12 @@ export default {
     components: {
         Peers
     },
-
+    computed: {
+        ...mapState("user", [
+            "token",
+            "userinfo"
+        ])
+    },
     data() {
         return {
             postApi: null,
@@ -66,6 +74,7 @@ export default {
             ],
 
             // formData =========
+            way: 'create', // create/update/edit
             module: 5,
             id: undefined, // id存在，表示编辑
             reason: '', // 申请理由
@@ -73,38 +82,44 @@ export default {
             end_time: '', // 结束时间
             type: undefined, // 市内，市外
 
-            document: '', // 附件
-            images: '', // 图片
+            document: [], // 附件
+            images: [], // 图片
             remark: '', // 备注
             is_who: 0, // 是否出境
-            peer_user: [ // 同行人员信息
-                // {
-                //     is_who: '',
-                //     user_id: '',
-                //     name: '',
-                //     desc: ''
-                // }
-            ],
+
+            // 同行人员信息
+            // { is_who, user_id, name, desc }
+            peer_user: [],
             approve_user: '',
-            copy_user: ''
+            copy_user: '',
+
+
+            // 申请人
+            apply_user_id: '',
+            apply_user_name: ''
             // ===========================
         }
     },
     created() {
         this.navigationSetting()
         this.init()
+
+        // NOTE: 申请人 => 默认是账号本人
+        if (this.token) {
+            this.apply_user_id = this.userinfo.userid
+            this.apply_user_name = this.userinfo.name
+        }
     },
     methods: {
         init() {
             this.getCommonFlowPathData()
             this.postApi = this.flag === 'approve' ? editApprove : postCreateInfo
         },
+
         // NOTE: 格式化编辑数据
         handleFormatEditData(data) {
-            console.log('%c data---- >>>', 'background: blue; color: #fff', data);
             const {
                 module_info,
-                id,
                 peerUser
             } = data
             const {
@@ -114,14 +129,12 @@ export default {
                 remark,
                 start_time,
                 type,
-                // document_text,
-                // images,
-                // images_text,
-                // info_id,
-                // document,
             } = module_info /* eslint-disable-line */
 
-            this.id = id
+            const IS_EDIT = this.flag === 'approve'
+            this.way = IS_EDIT ? 'edit' : 'update'
+            this.id = IS_EDIT ? data.approve_id : data.id
+            // this.id = id
             this.peer_user = peerUser
             this.reason = reason
             this.start_time = start_time
@@ -129,6 +142,24 @@ export default {
             this.type = type
             this.remark = remark
             this.is_who = is_who
+
+            // 申请人Id 对应 中文字段
+            if (data.apply_user) {
+                this.apply_user_id = data.apply_user.userid
+                this.apply_user_name = data.apply_user.name
+            }
+
+            if (Array.isArray(data.module_info.document_text) && data.module_info.document_text.length) {
+                this.document = module_info.document.split(',').map(doc => ({
+                    url: doc
+                }))
+            }
+
+            if (Array.isArray(data.module_info.images_text) && data.module_info.images_text.length) {
+                this.images = data.module_info.images_text.map(img => ({
+                    url: img
+                }))
+            }
         },
 
         // NOTE: 设置标题等
@@ -165,20 +196,12 @@ export default {
         },
         async __post__(data) {
             try {
-                // TODO: 审批人修改需要更换接口
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);
@@ -204,7 +227,7 @@ export default {
                 data
             }, (data, hasEmpty, hasKey) => {
                 // 判断当type == 1 市内出差时。 判断是否出境
-                if (data.type == 1 && !data.is_who) {
+                if (data.type == 1 && !['0', '1'].includes(String(data.is_who))) {
                     hasEmpty = true
                     hasKey = 'is_who'
                 }
@@ -213,6 +236,7 @@ export default {
         },
         __format_data__() {
             let params = {
+                way: this.way,
                 module: 5,
                 reason: this.reason, // 申请理由
                 start_time: this.start_time, // 开始时间
@@ -231,7 +255,8 @@ export default {
                     }))
                 ],
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
-                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
+                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(','),
+                apply_user_id: this.apply_user_id
             }
 
             let images = this.images

src/views/applyfor/components/IndexType6.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="type6-container">
-        <c-select-imitate title="申请人" />
+        <c-select-imitate title="申请人" :value="apply_user_name" />
 
         <c-select title="请假类型" :required="true" :list="askForleaveTypeList" pickerValueKey="name" pickerValueId="id"
             v-model="type" />
@@ -19,7 +19,7 @@
 
         <c-input title="是否离“深”" input-type="textarea" placeholder="需写清目的地（到街道）、是否涉疫、出行方式及班次" v-model="remark" />
 
-        <c-flow-path :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
+        <c-flow-path ref="cFlowPathRef" :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
     </div>
 </template>
 
@@ -41,6 +41,10 @@ export default {
         indexMixin
     ],
     computed: {
+        ...mapState("user", [
+            "token",
+            "userinfo"
+        ]),
         ...mapState("enum", {
             "askForleaveTypeList": "leaveTypeList",  // 请假类型
             "timeList": "timeList"
@@ -51,6 +55,7 @@ export default {
             postApi: null,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 6,
             reason: '', // 请假原因
@@ -65,6 +70,10 @@ export default {
             time: '', // 请假时长
             approve_user: [],
             copy_user: [],
+
+            // 申请人
+            apply_user_id: '',
+            apply_user_name: '',
             // formData end
 
             flow_item: '',
@@ -79,6 +88,14 @@ export default {
                 name: 'AskForLeave'
             })
         } else this.type = type
+
+        // NOTE: 申请人 => 默认是账号本人
+        if (this.token) {
+            this.apply_user_id = this.userinfo.userid
+            this.apply_user_name = this.userinfo.name
+        }
+
+        this.init()
     },
 
     methods: {
@@ -93,7 +110,30 @@ export default {
 
         // 获取编辑数据
         handleFormatEditData(data) {
+            const { module_info } = data
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
+
+            const IS_EDIT = this.flag === 'approve'
+            this.way = IS_EDIT ? 'edit' : 'update'
+            this.id = IS_EDIT ? data.approve_id : data.id
+
+            // 申请人Id 对应 中文字段
+            if (data.apply_user) {
+                this.apply_user_id = data.apply_user.userid
+                this.apply_user_name = data.apply_user.name
+            }
+
+            if (Array.isArray(data.module_info.document_text) && data.module_info.document_text.length) {
+                this.document = module_info.document.split(',').map(doc => ({
+                    url: doc
+                }))
+            }
+
+            if (Array.isArray(data.module_info.images_text) && data.module_info.images_text.length) {
+                this.images = data.module_info.images_text.map(img => ({
+                    url: img
+                }))
+            }
         },
 
         /**
@@ -110,13 +150,15 @@ export default {
 
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 type: this.type,
                 remark: this.remark,
                 time: this.time,
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
-                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
+                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(','),
+                apply_user_id: this.apply_user_id
             }
             if (this.start_time) {
                 const [date, amOrPm] = this.start_time.split(' ')
@@ -129,9 +171,15 @@ export default {
                 templateObj.end_am = amOrPm
             }
 
-            // TODO: 格式化尚未完成
-            // document
-            // images
+            let images = this.images
+            if (Array.isArray(images) && images.length) {
+                templateObj.images = images.map(image => image.url).join(',')
+            }
+
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             return templateObj
         },
@@ -159,16 +207,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);
@@ -197,6 +238,9 @@ export default {
                 this.flow_item = id
                 this.getCommonFlowPathData({
                     flow_item: id
+                }, () => {
+                    this.$refs.cFlowPathRef.__render_a__()
+                    this.$refs.cFlowPathRef.__render_c__()
                 })
             }
         },
@@ -208,10 +252,10 @@ export default {
         },
 
         start_time() {
-            this.checkTimeAndGetFlow()
+            // this.checkTimeAndGetFlow()
         },
         end_time() {
-            this.checkTimeAndGetFlow()
+            // this.checkTimeAndGetFlow()
         }
     }
 }

src/views/applyfor/components/IndexType7.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="type6-container">
 
+        <c-select-imitate title="申请人" :value="apply_user_name" />
 
-        <c-select-imitate title="申请人" :value="apply_user_id_txt" @click="handleEditApplyofUser" />
+        <!-- <c-select-imitate title="申请人" :value="apply_user_id_txt" @click="handleEditApplyofUser" /> -->
 
         <div class="group-box">
             <div class="group__title">用车信息</div>
@@ -58,8 +59,7 @@ export default {
             postApi: null,
 
             // formData start
-            apply_user_id: '',
-            apply_user_id_txt: '',
+            way: 'create', // create/update/edit
             id: '',
             module: 7,
             reason: '', // 出发地点
@@ -70,7 +70,10 @@ export default {
             reach_address: '', // 到达地点
             end_address: '', // 返回地点
             approve_user: [],
-            copy_user: []
+            copy_user: [],
+            // 申请人
+            apply_user_id: '',
+            apply_user_name: '',
             // formData end
         }
     },
@@ -79,20 +82,40 @@ export default {
         this.getCommonFlowPathData()
         this.postApi = this.flag === 'approve' ? editApprove : postCreateInfo
 
-
-        console.log('%c ???? >>>', 'background: blue; color: #fff', this.token);
-
+        // NOTE: 申请人 => 默认是账号本人
         if (this.token) {
-            console.log('%c ----- >>>', 'background: blue; color: #fff', this.userinfo);
-            this.apply_user_id_txt = this.userinfo.name
             this.apply_user_id = this.userinfo.userid
+            this.apply_user_name = this.userinfo.name
         }
     },
 
     methods: {
         // 获取编辑数据
         handleFormatEditData(data) {
+            const { module_info } = data
+
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
+            const IS_EDIT = this.flag === 'approve'
+            this.way = IS_EDIT ? 'edit' : 'update'
+            this.id = IS_EDIT ? data.approve_id : data.id
+
+            // 申请人Id 对应 中文字段
+            if (data.apply_user) {
+                this.apply_user_id = data.apply_user.userid
+                this.apply_user_name = data.apply_user.name
+            }
+
+            if (Array.isArray(data.module_info.document_text) && data.module_info.document_text.length) {
+                this.document = module_info.document.split(',').map(doc => ({
+                    url: doc
+                }))
+            }
+
+            if (Array.isArray(data.module_info.images_text) && data.module_info.images_text.length) {
+                this.images = data.module_info.images_text.map(img => ({
+                    url: img
+                }))
+            }
         },
         /**
          * @description 提交数据默认函数
@@ -107,12 +130,14 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 reach_address: this.reach_address,
                 end_address: this.end_address,
                 approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(','),
-                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
+                copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(','),
+                apply_user_id: this.apply_user_id
             }
             if (this.start_time) {
                 const [date, amOrPm] = this.start_time.split(' ')
@@ -125,9 +150,17 @@ export default {
                 templateObj.end_am = amOrPm
             }
             if (this.id) templateObj.id = this.id
-            // TODO: 格式化尚未完成
-            // document
-            // images
+
+            let images = this.images
+            if (Array.isArray(images) && images.length) {
+                templateObj.images = images.map(image => image.url).join(',')
+            }
+
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
+
             return templateObj
         },
         validate(data) {
@@ -152,16 +185,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
 
                 }
             } catch (e) {

src/views/applyfor/components/IndexType8.vue

@@ -14,7 +14,7 @@
 
         <c-input title="具体内容" :required="true" input-type="textarea" :maxlength="800" v-model="desc" />
 
-        <c-files ctype="images" v-model="images" placeholder="最多九张" />
+        <c-files ref="imageM8Ref" ctype="images" v-model="images" placeholder="最多九张" />
 
         <c-flow-path :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
 
@@ -103,6 +103,8 @@ export default {
                     url: img
                 }))
             }
+
+            this.$refs.imageM8Ref.handleUpdateValues()
         },
         /**
          * @description 提交数据默认函数
@@ -165,6 +167,18 @@ export default {
             }
         },
     },
+    watch: {
+        type: {
+            handler(val, oldv) {
+                if (val && val !== oldv) {
+                    this.getCommonFlowPathData({
+                        flow_item: val
+                    })
+                }
+            },
+            immediate: true
+        }
+    }
 }
 
 </script>

src/views/applyfor/components/IndexType9.vue

@@ -2,7 +2,11 @@
     <div class="type6-container">
         <c-select title="合同类型" :list="contractTypeList" pickerValueKey="name" pickerValueId="id" v-model="type" />
 
-        <c-input title="合同编号" :required="true" v-model="reason" />
+        <c-select-imitate v-if="about_order_no" title="关联申购申请-采购订单" :value="about_order_no" :hide-remove="true" />
+
+        <!--
+            useless.
+            <c-input title="合同编号" :required="true" v-model="reason" /> -->
 
         <c-select title="缓急程度" :required="true" :list="degreeList" pickerValueKey="name" pickerValueId="id"
             v-model="desc" />
@@ -47,7 +51,7 @@ export default {
             way: 'create',
             id: '',
             module: 9,
-            reason: '', // 合同编号
+            // reason: '', // 合同编号
             type: '', // 合同类型
             desc: '', // 缓急程度
             document: [], // 附件
@@ -56,14 +60,21 @@ export default {
             scope: '', // 发放范围
             legal_opinion: '',  // 法务意见
             approve_user: [],
-            copy_user: []
+            copy_user: [],
             // formData end
+            about_order_no: '',
         }
     },
 
     created() {
         this.getCommonFlowPathData()
         this.postApi = postCreateInfo
+
+
+        // 关联采购订单
+        if (this.$route.query.order_no) {
+            this.about_order_no = this.$route.query.order_no
+        }
     },
 
     methods: {
@@ -101,19 +112,21 @@ export default {
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
+            let documents = this.document
+            if (Array.isArray(documents) && documents.length) {
+                templateObj.document = documents.map(document => document.url).join(',')
+            }
 
             if (this.id) templateObj.id = this.id
             return templateObj
         },
         validate(data) {
             let mapTxt = {
-                'reason': '合同编号',
+                // 'reason': '合同编号',
                 'desc': '缓急程度'
             }
             let requiredKey = [
-                'reason',
+                // 'reason',
                 'desc'
             ]
             return this.__validtor__({
@@ -127,17 +140,9 @@ export default {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
                     this.$toast(res.msg)
-
-                    // TODO: 提交成功后跳转到我的审批
-                    /*
-                    this.$router.push({
-                        name: '',
-                        query: {
-                            formtype: this.formType
-                        }
-                    })
-                    */
-
+                    if (this.flag === 'approve') {
+                        this.$router.go(-1)
+                    } else this.__jump2apply_state__()
                 }
             } catch (e) {
                 console.log('it5, __post__', e);

src/views/applyfor/goods-specifications.vue

@@ -33,12 +33,12 @@
             <!-- <van-icon v-show="closeable" @click="handleClose(item, idx)" name="delete-o" :size="18" color="#b8b8b8" /> -->
           </div>
           <div class="row__main">
-            <!-- NOTE: 价格展示只在 申购出入库才有 -->
-            <c-input title="价格" :maxlength="9" :showWordLimit="false" input-type="number" v-model="item.price" />
+            <!-- NOTE: 价格展示只在 申购出入库 才有 -->
+            <c-input v-if="$route.query.showPrice == 1" title="价格" :maxlength="9" :showWordLimit="false"
+              input-type="number" v-model="item.price" />
             <c-input title="数量" :maxlength="5" :showWordLimit="false" input-type="digit" v-model="item.stock" />
           </div>
         </div>
-
       </div>
 
       <!-- 规格示例 -->
@@ -89,9 +89,23 @@ export default {
       const stocks = goods_stock ? JSON.parse(goods_stock) : []
 
       if (stocks.length) {
-        this.goods_stock = [...stocks].reverse()
+        this.goods_stock = [...stocks].map(item => {
+          let temp = {
+            ...item,
+            stock: `${item.stock}`
+          }
+
+          // 数量
+          if (item.stock) temp.stock = `${item.stock}`
+
+          // 价格
+          if (item.price) temp.price = `${item.price}`
+
+          return temp
+        }).reverse()
       }
     },
+
     // Remove all standars
     handleRemoveAll() {
       this.$dialog.confirm({
@@ -162,12 +176,16 @@ export default {
     handleSubmitStandars() {
       const arrs = this.goods_stock
       let isExist = false
+      const checkPrice = Boolean(this.$route.query.showPrice)
       // NOTE: 判断内容是否存在
       for (let i = 0; i < arrs.length; i++) {
         const { price, stock, name } = arrs[i];
-        if (!price || !stock) {
+        if (!stock || (checkPrice && !price)) {
           isExist = true
-          this.$toast(`规则${name}的${!price ? '价格' : '数量'}为空，请填写`)
+          let str = !stock ? '数量' : ''
+          // 根据是否检查价格判断
+          if (checkPrice) str = !price ? '价格' : ''
+          this.$toast(`规则${name}的${str}为空，请填写`)
           break
         }
       }

src/views/applyfor/goods.vue

@@ -86,7 +86,8 @@ export default {
     goods_no: '',
     goods_name: '',
     goods_brand: '',
-    goods_stock: [] // object[]
+    goods_stock: [], // object[]
+    row: null
   }),
   created() {
     vueBus.$on('listenCategoryEvent', this.handleCategoryData)
@@ -95,14 +96,16 @@ export default {
     if (flag === '3') { // update state
       const row = JSON.parse(this.$route.query.edit)
       if (row) {
+        this.row = row
+        console.log('%c update row??? >>>', 'background: blue; color: #fff', row);
         this.flag = flag
-        this.goods_id = row.goods_id
-        this.goods_category_first = row.goods_category_first
-        this.goods_category_id = row.goods_category_id
-        this.goods_no = row.goods_no
-        this.goods_name = row.goods_name
-        this.goods_brand = row.goods_brand
-        this.goods_stock = row.goods_stock
+        this.goods_id = row.goods_id || undefined
+        this.goods_category_first = row.goods_category_first || ''
+        this.goods_category_id = row.goods_category_id || ''
+        this.goods_no = row.goods_no || ''
+        this.goods_name = row.goods_name || ''
+        this.goods_brand = row.goods_brand || ''
+        this.goods_stock = row.goods_stock || []
         if (row.__id__) this.id = row.__id__ // 自定义添加商品才有
       }
     }
@@ -134,26 +137,23 @@ export default {
         name: 'GoodsSpeci',
         query: {
           // standars: this.standars.join(','),
+          // NOTE: 只有type === 1才展示价格
+          showPrice: Number(['1'].includes(this.$route.query.type)),
           goods_stock: JSON.stringify(this.goods_stock)
         }
       })
     },
     handleClearStandards() {
-      // this.standars = []
       this.goods_stock = []
     },
 
     // NOTE: 更新规格数据
     handleStandarsData(arrs) {
-      console.log('%c ???? >>>', 'background: blue; color: #fff', arrs);
-
-      // this.standars = arrs
       this.goods_stock = [...arrs]
     },
 
     // 确认提交
     handleConfirmSubmit() {
-
       const temporary = {
         flag: this.flag,
         goods_category_first: this.goods_category_first,
@@ -165,15 +165,23 @@ export default {
       }
 
       if (this.flag === '3') { // update online goods
+        if (this.row.flag) temporary.flag = this.row.flag
+
         if (this.goods_id) { // 线上商品
           temporary.goods_id = this.goods_id
         } else if (this.id) { // 新增商品-修改
           temporary['__id__'] = this.id
         }
-      } else temporary['__id__'] = Date.now()
+
+      } else temporary['__id__'] = `${Date.now()}`
 
       vueBus.$emit('changeGoods', temporary)
+
       this.$nextTick(() => {
+        this.$store.commit({
+          type: "app/ROUTE_REMOVE",
+          value: "Goods"
+        })
         this.$router.go(-1)
       })
     }

src/views/applyfor/index.vue

@@ -81,6 +81,7 @@ import IndexType11 from './components/IndexType11.vue';
 
 // Api
 import * as approveInfoApi from '@/api/approveinfo'
+
 import * as approveApi from '@/api/approve'
 
 import store from '@/store';
@@ -121,8 +122,8 @@ export default {
         IndexType9,
         IndexType10,
         IndexType11,
-        // bizCont
     },
+
     computed: {
         // 获取需要渲染的组件
         renderComponent() {
@@ -159,8 +160,6 @@ export default {
             if (this.isEdit) this.__detail__()
         },
 
-        // NOTE: 因为是编辑 需要判断接口
-        // TODO: 缺少
         async __detail__() {
             try {
                 const func = this.flag === 'info' ? approveInfoApi.getInfo : approveApi.getInfo

src/views/applyfor/indexMixins.js

@@ -34,25 +34,19 @@ export default {
         /**
          * @description 普通申请人获取的默认审核流程数据
          *  */
-        async getCommonFlowPathData (options = {}) {
+        async getCommonFlowPathData (options = {}, callback) {
             try {
                 let module = this.module
                 const params = {
                     module
                 }
 
-                // NOTE: moduel = [5, 6]时，需要填写 `flow_item`字段。 取值 `options.flow_item`; 获取审批流程
-                if ([5, 6].includes(module) && options.flow_item) params['flow_item'] = options.flow_item
+                // NOTE: moduel = [5, 6, 8]时，需要填写 `flow_item`字段。 取值 `options.flow_item`; 获取审批流程
+                if ([5, 6, 8].includes(module) && options.flow_item) params['flow_item'] = options.flow_item
                 const res = await getApproveFlowPath(params)
 
                 if (res.code === 1) {
-                    /*
-                    [{
-                        userid: string,
-                        avatar: string,
-                        name: string
-                    }]
-                     */
+                    /* { userid: string, avatar: string, name: string }[] */
                     const { 
                         approve_user = [],
                         copy_user = [],
@@ -62,6 +56,8 @@ export default {
                     this.approvePeople = approve_user
                     this.copyPeople = copy_user
 
+
+                    callback && callback()
                 }
             } catch (e) {
                 console.log(e);

src/views/approve/components/ApproveControl.vue

@@ -1,11 +1,18 @@
 <template>
-    <div class="approve-control-container flex flex-row flex-row-aic">
+    <div :class="[
+        'approve-control-container flex flex-row flex-row-aic',
+        flag === 'info' ? 'flex-row-jcsp' : 'flex-row-jcsa'
+    ]">
         <!-- 
             flag = info 几种状态
             2处理中: 催办，撤销，下载文件
             3通过： 催办（disabled),修改（disabled), 撤销，下载
-            4已驳回：催办（disabled),修改，撤销，下载
-            5撤销：重新发起
+            4已驳回：催办（disabled),重新发起,修改，撤销，下载
+            5撤销：null
+
+            TODO:
+            采购通过
+                申请合同呈批、采购明细、撤销（dis)、下载文件
          -->
 
         <!-- 
@@ -42,6 +49,8 @@
 
 import { putUrging, putCancel } from '@/api/approveinfo'
 
+import { SAVE_PROCURE_INFO_TEMPORARY } from '@/utils/constant'
+
 export default {
     name: 'ApproveControl',
     props: {
@@ -58,6 +67,10 @@ export default {
         flagState: { // NOTE: flag的状态值`status`
             type: Number
         },
+        editData: {
+            type: Object,
+            default: () => ({})
+        }
     },
     computed: {
         controlComputed() {
@@ -65,7 +78,8 @@ export default {
             let state = Number(this.flagState)
             let module = this.module
             console.log(flag, state, module);
-            const [urging, edit, revoke, ding, print, REISSUE, pushResult] = this.control
+            const [urging, edit, revoke, ding, print, REISSUE, applyApproval, pushResult] = this.control; /* disable-line */
+            console.log(applyApproval);
             let temparr = []
 
             if (flag === 'info') {
@@ -74,10 +88,9 @@ export default {
                     case 2:
                         temparr = [
                             urging,
-                            // TEMPORARY: 临时取消注释展示
                             {
                                 ...edit,
-                                disable: false
+                                disable: true
                             },
                             revoke,
                             print
@@ -94,16 +107,42 @@ export default {
                     case 4:
                         temparr = [
                             { ...urging, disable: true },
-                            edit,
+                            // edit,
+                            REISSUE,
                             revoke,
                             print
                         ]
                         break;
-                    case 5:
-                        temparr = [
-                            REISSUE
+                    // case 5:
+                    //     temparr = [
+                    //         REISSUE
+                    //     ]
+                    //     break;
+                }
+
+                // 通过状态
+                if (state === 3 && [1].includes(this.module)) {
+                    // 采购申请
+                    if (this.module === 1) {
+                        let arrs = [
+                            {
+                                title: "申请合同呈批",
+                                img: require('@/assets/approve/folder-up.png'),
+                                event: this.handleJump2Contract
+                            }
                         ]
-                        break;
+
+                        // NOTE: 只有 `type === 1` 时才有数据
+                        if (this.editData.type == 1) {
+                            arrs.push({
+                                title: "采购明细",
+                                img: require('@/assets/approve/procure.png'),
+                                event: this.handleSeeProcureInfo
+                            })
+                        }
+
+                        temparr.splice(0, 2, ...arrs)
+                    }
                 }
             } else if (flag === 'approve') {
                 switch (state) {
@@ -116,7 +155,8 @@ export default {
                         ]
                         break;
                     case 3:
-                        if (module === 8) temparr.push(pushResult)
+                        // 维修时添加上上传结果
+                        if (module === 8 && (this.editData && this.editData.is_feedback)) temparr.push(pushResult)
                         temparr.push(print)
                         break;
                     // case 4: // 收到的没有状态
@@ -125,6 +165,8 @@ export default {
             return temparr
         },
         btnIshow() {
+            // TODO: 判断需要加强 - editData
+            // 只有当前审核人员才有 同意与拒绝
             return this.flag === 'approve' && Number(this.flagState) === 2
         },
     },
@@ -134,7 +176,7 @@ export default {
             control: [ // NOTE: [WARNING] 顺序不可更改。
                 {
                     title: "催办",
-                    img: require('@/assets/icons-ding.png'),
+                    img: require('@/assets/approve/cuiban.png'),
                     event: this.handleDingEvent
                 },
                 {
@@ -144,7 +186,7 @@ export default {
                 },
                 {
                     title: "撤销",
-                    img: require('@/assets/icons-ding.png'),
+                    img: require('@/assets/approve/chexiao.png'),
                     event: this.handleRevokeEvent
                 },
                 {
@@ -157,23 +199,22 @@ export default {
                     img: require('@/assets/icons-print.png'),
                     event: this.handleDownloadFileEvent
                 },
-                // NOTE: 重新发起
                 {
                     title: "重新发起",
-                    img: require('@/assets/icons-print.png'),
-                    event: this.handleEvent
+                    img: require('@/assets/approve/folder-enter.png'),
+                    event: this.handleEditEvent
                 },
-                // NOTE: 申请呈批(专属。申请呈批)
                 {
+                    // NOTE: 申请呈批(专属。申请呈批)
                     title: "申请呈批",
                     img: require('@/assets/icons-print.png'),
                     event: this.handleEvent
                 },
-                // NOTE: 我的维修专属
                 {
+                    // NOTE: 我的维修专属
                     title: '上传反馈结果',
-                    img: require('@/assets/icons-print.png'),
-                    event: this.handleEvent
+                    img: require('@/assets/approve/feedback.png'),
+                    event: this.handleUploadFeedback
                 }
             ]
         }
@@ -182,15 +223,22 @@ export default {
         handleEvent() {
             this.$toast('等待功能实现中')
         },
-        // NOTE: 提醒
-        // TODO: 申请提醒/审批提醒
+        handleUploadFeedback() {
+            this.$router.push({
+                name: 'FeedbackResult',
+                query: {
+                    id: this.id
+                }
+            })
+        },
+
+        // NOTE: 催办
         async handleDingEvent() {
             try {
-                const func = this.flag === 'info' ? putUrging : () => { }
                 const params = {
                     id: this.id
                 }
-                const result = await func(params)
+                const result = await putUrging(params)
                 if (result.code === 1) {
                     this.$toast(result.msg)
                 }
@@ -198,6 +246,7 @@ export default {
                 console.log('ding err>', error);
             }
         },
+
         // NOTE: 驳回
         async handleRevokeEvent() {
             try {
@@ -205,7 +254,9 @@ export default {
                 const params = {
                     id: this.id
                 }
+
                 const result = await func(params)
+
                 if (result.code === 1) {
                     console.log('%c revoke event data >>>', 'background: blue; color: #fff', result.data);
                     this.$toast(result.msg)
@@ -215,7 +266,7 @@ export default {
             }
         },
         // NOTE: 下载文件
-        // TODO: 下载文件尚未拥有
+        // TODO: 下载文件接口
         handleDownloadFileEvent() {
             try {
                 this.$toast('功能迭代中...')
@@ -237,16 +288,49 @@ export default {
             })
         },
 
+        // 跳转审核页面
         handleGoExaminePage(type) {
-            console.log('type', type);
+            const query = {
+                id: this.id,
+                type
+            }
+
+            // NOTE: 维修时需要指派维修人员
+            if (this.module === 8 && this.editData.is_maintain) {
+                query.maintain_type = this.editData.type
+            }
+
             this.$router.push({
                 name: 'Examine',
+                query
+            })
+        },
+
+        // 跳转合同申请页面
+        handleJump2Contract() {
+            this.$router.replace({
+                name: 'Applyfor',
                 query: {
-                    // 携带详情Id.
-                    type
+                    type: 9,
+                    'order_no': this.editData.order_no
                 }
             })
         },
+
+
+        // NOTE: 跳转采购明细页面
+        handleSeeProcureInfo() {
+            let arrs = this.editData.apply_goods
+            if (Array.isArray(arrs) && arrs.length) {
+                localStorage.setItem(SAVE_PROCURE_INFO_TEMPORARY, JSON.stringify(this.editData.apply_goods))
+                this.$router.push({
+                    name: 'ProcureInfo'
+                })
+            } else {
+                this.$toast('暂无采购明细！')
+            }
+        }
+
     }
 }
 </script>
@@ -258,7 +342,6 @@ export default {
     &-container {
         padding: 11px 24px 30px;
         background-color: #f2f1f6;
-        justify-content: space-between;
 
         .item {
             display: flex;

src/views/approve/components/ApproveFlowPath.vue

@@ -5,7 +5,8 @@
         </div>
         <div class="flow-path-main">
             <!-- 发起人 -->
-            <div class="row flex flex-row" v-if="create">
+            <!-- NOTE: Useless -->
+            <!-- <div class="row flex flex-row" v-if="create">
                 <div class="row__line"></div>
                 <div class="avatar avatar--name">
                     <template v-if="create.avatar">
@@ -14,10 +15,6 @@
                     <template v-else>
                         <span class="avatar__name">{{ create.name | changeName }}</span>
                     </template>
-                    <!-- TODO: 状态是否需要 -->
-                    <!-- <div class="status-bar">
-                        <van-icon color="rgba(254, 148, 62, 1)" :size="16" name="more" />
-                    </div> -->
                 </div>
                 <div class="row-main">
                     <div class="header flex flex-row flex-row-aic">
@@ -30,10 +27,10 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> -->
 
             <!-- 审批人 -->
-            <div class="row flex flex-row" v-for="(person, idx) in approveList" :key="idx">
+            <div class="row flex flex-row" v-for="(person, idx) in  approveList " :key="idx">
                 <div class="row__line"></div>
                 <div class="avatar avatar--name">
                     <template v-if="person.user.avatar">
@@ -48,13 +45,14 @@
                 </div>
                 <div class="row-main">
                     <div class="header flex flex-row flex-row-aic">
-                        <span class="header__title">审批人</span>
-                        <span class="header__time">{{ person.approve_time }}</span>
+                        <span class="header__title">{{ person.group === 1 ? '申请人' : '审批人' }}</span>
+                        <span class="header__time" v-if="person.approve_time">{{ person.approve_time }}</span>
                     </div>
                     <div class="mainbox flex flex-row flex-row-aic">
-                        <div class="mainbox__cur-name">
-                            {{ person.user.name }}（<span :class="handleMapClass(person.status)">{{ person.status |
-                                filterFlowPathStatusTxt }}</span>）
+                        <div class="mainbox__cur-name">{{ person.user.name }}<template v-if="person.group !== 1">（<span
+                                    :class="handleMapClass(person.status)">{{ person.status |
+                                        filterFlowPathStatusTxt }}</span>）
+                            </template>
                         </div>
                         <div class="mainbox__cur-use-time" v-if="person.time_text">
                             平均审批时长：{{ person.time_text }}
@@ -93,7 +91,8 @@
                     </div>
                     <div class="footerinfo footerinfo--ptop10">
                         <div v-show="seeMoreCopy" class="recive-of flex flex-row flex-row-aic">
-                            <div class="personal flex flex-col flex-col-aic" v-for="(personal, idx) in copys" :key="idx">
+                            <div class="personal flex flex-col flex-col-aic" v-for="( personal, idx ) in  copys "
+                                :key="idx">
                                 <div class="avatar avatar--name">
                                     <span class="avatar__name">{{ personal.user.name | changeName }}</span>
                                     <div class="status-bar" v-if="false">
@@ -197,6 +196,13 @@ export default {
     position: relative;
     margin-bottom: 43px;
 
+    &:last-child {
+        .row__line {
+            // NOTE: 让其最后一个不展示
+            height: 0;
+        }
+    }
+
     .avatar {
         position: relative;
         width: 36px;
@@ -238,6 +244,7 @@ export default {
             bottom: 0;
             width: 14px;
             height: 14px;
+            font-size: 0;
             text-align: center;
             line-height: 14px;
             background: @white;

src/views/approve/components/DetailRows.vue

@@ -3,11 +3,14 @@
         <div class="detail-rows-container__title flex flex-row flex-aic">
             <div>
                 <span>{{ title }}</span>
-                <!-- TODO: 物品明细 - 下载按钮 -->
+                <span v-if="$attrs.module === 4 && type === 'projects'" class="download-info"
+                    @click="handleDownloadInfo($attrs.id)">
+                    <img src="../../../assets/approve/download.png" alt="">
+                    下载
+                </span>
             </div>
 
-            <!-- TODO: 采购明细 展开&收起 -->
-            <div class="more-box" v-if="type === 'projects'" @click="() => more = !more">
+            <div class="more-box" v-if="type === 'projects' && value.length > 2" @click="() => more = !more">
                 <span>{{ moreText }}</span>
                 <van-icon v-if="more" name="arrow-up" />
                 <van-icon v-else name="arrow-down" />
@@ -17,43 +20,44 @@
         <div v-if="[undefined, ''].includes(type)" class="value value--common">{{ value }}</div>
         <div class="value value--link" v-else-if="type === 'link'">{{ value }}</div>
 
-        <!-- TODO: 后期添加 filter -->
         <div class="value value--common" v-else-if="type === 'date'">{{ value }}</div>
 
-        <!-- TODO: 类型枚举 -->
         <div class="value value--common" v-else-if="type === 'type'">{{ value }}</div>
 
-        <!-- TODO: 明细 后期会有更加细致的划分。 因为有11种模块 -->
+        <!-- : 明细 后期会有更加细致的划分 -->
         <template v-else-if="type === 'projects'">
             <!-- 采购商品明细 -->
+            <!-- 领用明细 -->
+            <!-- 入库明细 -->
+
             <div class="projects-box-wrapper">
-                <div class="projects-box" v-for="(item, idx) in value" :key="idx">
+                <div class="projects-box" v-for="(item, idx) in handleListenMore(value)" :key="idx">
                     <div class="projects__header flex flex-row flex-row--aic">
-                        <div class="title">{{ item.projectName }}</div>
-                        <div class="count">x{{ item.count }}</div>
+                        <div class="title">{{ item.goods_name }}</div>
                     </div>
-                    <div class="projects__footer flex flex-row flex-row-aic">
-                        <div class="tags">
-                            <span v-for="(tag, tagidx) in item.tags" :key="tagidx">
-                                {{ tag }} {{ item.tags.length - 1 !== tagidx ? '；' : '' }}
+                    <div class="projects__footer">
+                        <div class="tags flex flex-row flex-row-aic" v-for="(stock, tagidx) in item.goods_stock"
+                            :key="tagidx">
+                            <span class="category_name">
+                                {{ stock.name }}
                             </span>
+                            <span class="category_count">x{{ stock.stock }}</span>
                         </div>
-                        <div class="money">
-                            ￥{{ item.money }}
+                        <div class="money" v-if="$attrs.module === 1">
+                            ￥{{ item.total_price }}
                         </div>
                     </div>
                 </div>
             </div>
-
         </template>
 
-
         <!-- NOTE: 附件材料 -->
         <template v-else-if="type === 'files'">
             <div class="files-container">
-                <div class="files-row flex flex-row flex-row-aic" v-for="(file, idx) in value" :key="idx">
+                <div class="files-row flex flex-row flex-row-aic" v-for="(file, idx) in handleFormatFiles(value)"
+                    :key="idx">
                     <div class="icon">
-                        <!-- NOTE: 根据文件类型放置Icon -->
+                        <img :src="handleGetFileImgPath(file.type)" alt="">
                     </div>
                     <div class="files-row__info">
                         <div class="files-name">{{ file.name }}</div>
@@ -63,7 +67,6 @@
                         </div>
                     </div>
                 </div>
-
             </div>
         </template>
 
@@ -82,6 +85,12 @@
 <script>
 import { ImagePreview } from 'vant'
 
+import { getStaticLinkInfo } from '@/utils/util'
+
+import { excelSuffix, wordSuffix, pdfSuffix, pictureSuffix } from '@/utils/constant'
+
+// import { downloadFileUseATarget } from '@/utils/util';
+
 export default {
     props: {
         title: {
@@ -112,22 +121,82 @@ export default {
     },
     data() {
         return {
-            more: true, // 展开与收起的`more`key
+            excelSuffix,
+            wordSuffix,
+            pdfSuffix,
+            pictureSuffix,
+            more: false, // 展开与收起的`more`keyword
         }
     },
     methods: {
+        // NOTE: 根据类型获取图片链接
+        handleGetFileImgPath(type) {
+            if (pictureSuffix.includes(type)) return require("../../../assets/icon-pic.png")
+            else if (wordSuffix.includes(type)) return require("../../../assets/icon-word.png")
+            else if (pdfSuffix.includes(type)) return require("../../../assets/icon-pdf.png")
+            else if (excelSuffix.includes(type)) return require("../../../assets/icon-excel.png")
+            return ""
+        },
         // TODO: Review files
         handleReviewFiles(file, index) {
-            console.log('handleReviewFile', file, index);
+            if (pictureSuffix.includes(file.type)) {
+                ImagePreview({
+                    images: [file.url],
+                    startPosition: 0
+                })
+            } else {
+                console.log('handleReviewFile, 等待开发', file, index);
+            }
         },
 
-        // NOTE: Review images
+        // Review images
         handleReviewImages(files, idx) {
             ImagePreview({
                 images: files.map(file => file.url),
                 startPosition: idx
             })
+        },
+
+        // NOTE: 根据 `more` 字段展示数据内容
+        handleListenMore(list) {
+            let more = this.more
+            let len = list.length
+            if (len > 2 && !more) return list.slice(0, 2)
+            return list
+        },
+
+        // NOTE: 加工 files 数组
+        handleFormatFiles(files) {
+            return files.map(file => {
+                const { name, suffix, url } = getStaticLinkInfo(file.url)
+                return {
+                    url,
+                    type: suffix,
+                    name
+                }
+            })
+        },
+
+        // TODO: Download goods info 
+        // TODO: 缺少接口
+        async handleDownloadInfo(id) {
+            try {
+                console.log('%c info-id >>>', 'background: blue; color: #fff', id);
+                // const formData = {
+                //     module: this.type
+                // }
+                // const result = await getImportTemplate(formData)
+                // if (result.code === 1) {
+                //     const { url } = result.data
+                //     if (url) { // url 存在下载
+                //         downloadFileUseATarget(url)
+                //     } else this.$toast('请联系网络管理员')
+                // }
+            } catch (error) {
+                console.log('%c handleDownloadTemplate >>>', 'background: blue; color: #fff', error);
+            }
         }
+
     }
 
 }
@@ -155,6 +224,16 @@ export default {
                     margin-left: 2px;
                 }
             }
+
+            .download-info {
+                margin-left: 10px;
+                color: @link-color;
+
+                img {
+                    width: 12px;
+                    height: 12px;
+                }
+            }
         }
 
         .value {
@@ -183,20 +262,13 @@ export default {
             &-box {
 
                 .title,
-                .tags {
+                .category_name {
                     font-size: @font-size-common;
                     font-weight: 400;
                     color: #191A1E;
                     line-height: 18px;
                 }
 
-                .count {
-                    font-size: @font-size-third;
-                    font-weight: 400;
-                    color: #727273;
-                    line-height: 18px;
-                }
-
                 &:last-child {
                     .projects__footer {
                         border-bottom: initial;
@@ -213,34 +285,58 @@ export default {
             }
 
             &__footer {
-                justify-content: space-between;
                 padding-bottom: 10px;
                 border-bottom: 1px solid #D8D8D8;
                 margin-bottom: 10px;
                 overflow: hidden;
 
+                .tags {
+                    justify-content: space-between;
+                    padding: 2px 0;
+
+                    .category {
+                        &_name {
+                            font-size: 14px;
+                            color: #868686;
+                        }
+
+                        &_count {
+                            font-size: @font-size-third;
+                            font-weight: 400;
+                            color: #727273;
+                            line-height: 18px;
+                        }
+                    }
+                }
+
                 .money {
                     font-size: @font-size-common;
                     font-weight: 500;
-                    color: rgb(244, 86, 66);
                     line-height: 18px;
+                    padding: 6px 0;
+                    color: rgb(244, 86, 66);
                 }
             }
         }
 
         // 附件样式
         .files {
-            &-comtainer {}
+            &-container {
+                display: flex;
+                flex-direction: column;
+                row-gap: 8px;
+            }
 
             &-row {
                 .icon {
-                    width: 35px;
-                    height: 42px;
-                    background: #FFCF95;
+                    width: 40px;
+                    height: 40px;
                     margin-right: 12px;
-                }
 
-                &__info {}
+                    img {
+                        width: 100%;
+                    }
+                }
             }
 
             &-name {

src/views/approve/detail.vue

@@ -4,12 +4,13 @@
             <div class="title">
                 <span>{{ title }}</span>
             </div>
+
             <div class="location flex flex-row flex-row-cic">
-                <van-icon name="chat-o" />
+                <img v-show="subjectLogo" :src="subjectLogo" :alt="schoolName">
                 <span>{{ schoolName }}</span>
             </div>
 
-            <!-- TODO: 审核样式 -->
+            <!-- 审核样式 -->
             <div :class="[
                 'status-bar',
                 renderStatusBarClass
@@ -17,12 +18,44 @@
                 <span>{{ approveStatusMap }}</span>
             </div>
 
-            <!-- TODO: 配置审核通过/撤销/拒绝 -->
-            <div class="float-status">
-                审核状态标识：{{ dataDetail && dataDetail.status }}
+            <!-- 配置审核通过/撤销/拒绝 -->
+            <div class="float-status" v-if="dataDetail && [3, 4, 5].includes(dataDetail.status)">
+                <img v-if="dataDetail.status == 3" src="../../assets/approve/yitongguo.png" alt="">
+                <img v-else-if="dataDetail.status == 4" src="../../assets/approve/yibohui.png" alt="">
+                <img v-else-if="dataDetail.status == 5" src="../../assets/approve/yichexiao.png" alt="">
             </div>
         </div>
 
+        <template v-if="module === 8">
+            <div class="maintain-result" v-if="dataDetail && dataDetail.module_info.feedback_status == 1">
+                <div class="m__header">
+                    维修结果
+                </div>
+                <p class="m__msg">
+                    {{ dataDetail && dataDetail.module_info.feedback }}
+                </p>
+                <div class="m__imgs flex flex-row flex-row-aic" v-if="dataDetail && dataDetail.module_info.feedback_images">
+                    <template v-for="(imgUrl, idx) in dataDetail.module_info.feedback_images.split(',')">
+                        <img :src="imgUrl" :key="idx"
+                            @click="handleReviewImages(dataDetail.module_info.feedback_images.split(','), idx)">
+                    </template>
+                </div>
+            </div>
+
+            <!-- 维修满意度调查 -->
+            <div class="maintain-form" v-if="dataDetail && dataDetail.module_info.comment_status == 1">
+                <layout title="满意度评价">
+                    <van-rate :void-icon="require('../../assets/approve/flower.png')"
+                        :icon="require('../../assets/approve/flower-fill.png')" :size="28" readonly
+                        :value="dataDetail.module_info.comment_score" />
+                </layout>
+                <c-input title="评价" :readonly="true" :value="dataDetail.module_info.comment" />
+            </div>
+            <div v-else-if="pageType === 'info' && dataDetail && dataDetail.status === 3" class="evaluate">
+                请对维修结果做出评价，<span @click="showInputResd = true" class="evaluate__event">点击评价</span>
+            </div>
+        </template>
+
         <!-- 各种审批内容组件 -->
         <div class="examine-detail__main">
             <detail-rows class="detail-row" v-for="(row, idx) in datalist" :key="idx" v-bind="row" />
@@ -39,12 +72,29 @@
         <!-- operate. 操作台 -->
         <!-- 集成 提醒, 修改, 下载, 拒绝，同意  5种 -->
         <div class="approve-control">
-            <approve-control :id="id" :module="module" :flag="pageType" :flag-state="dataDetailStatusComputed" />
+            <approve-control :edit-data="dataDetail" :id="id" :module="module" :flag="pageType"
+                :flag-state="dataDetailStatusComputed" />
         </div>
+
+        <!-- NOTE: 添加 Popup 提交评价 -->
+        <van-popup v-model="showInputResd" style="background-color: transparent;" position="center">
+            <div class="popup-content">
+                <layout title="满意度评价" :required="true">
+                    <van-rate :size="28" v-model="resdScore" />
+                </layout>
+
+                <c-input title="评价" :required="true" input-type="textarea" v-model="resd" />
+
+                <div class="btn-container">
+                    <div class="btn-span" @click="handleSubmitEvaluate">提交</div>
+                </div>
+            </div>
+        </van-popup>
     </div>
 </template>
 
 <script>
+
 import * as dd from 'dingtalk-jsapi'
 
 import setLeft from 'dingtalk-jsapi/api/biz/navigation/setLeft'
@@ -61,15 +111,20 @@ import * as approveApi from '@/api/approve'
 
 import { mapState } from 'vuex'
 
-
 import { formatApplyforRows } from '@/utils/applyfor-item'
 
+import { ImagePreview } from 'vant'
+import Layout from '../applyfor/components/Layout.vue'
+import CInput from '../applyfor/components/CInput.vue'
+
 export default {
     name: 'ExamineDetail',
     components: {
         DetailRows,
         ApproveFlowPath,
-        ApproveControl
+        ApproveControl,
+        CInput,
+        Layout
     },
     computed: {
         dataDetailStatusComputed() {
@@ -77,7 +132,7 @@ export default {
             let from = this.pageFrom
             switch (from) {
                 case 'approve_3':
-                    return 4 // 审批详情。 我收到的 没有任何操作权限
+                    return 4 // 审批详情。我收到的 没有任何操作权限
                 default:
                     return status
             }
@@ -104,13 +159,15 @@ export default {
         title() {
             if (!this.dataDetail) return ''
             const { create_user } = this.dataDetail
-            return `${create_user.name}提交的申请单`
+            if (create_user.name) return `${create_user.name}提交的申请单`
+            else return ''
         },
         ...mapState('enum', [
             'evectionTypeList',
         ]),
         ...mapState('user', [
-            'schoolName'
+            'schoolName',
+            'subjectLogo'
         ]),
         approveStatusMap() {
             if (!this.dataDetail) return ''
@@ -125,95 +182,6 @@ export default {
             isiOS: checkPlatform() === 'iOS',
 
             datalist: [],
-            // datalist: [
-            //     {
-            //         title: '审批编号',
-            //         value: '20222110741458005442684',
-            //     },
-            //     {
-            //         title: '合同编号',
-            //         value: '20222110741458005442684',
-            //         type: 'link' // 代表它是一个链接
-            //     },
-            //     {
-            //         title: '所在部门',
-            //         value: '深圳市第二特殊教育学校-教师部'
-            //     },
-            //     {
-            //         title: '申请日期',
-            //         value: '2022-11-07',
-            //         type: 'date' // 代表返回的是unixtime 时间戳需要自己转义`dayjs`
-            //     },
-            //     {
-            //         title: '申请人',
-            //         value: '刘辉'
-            //     },
-            //     {
-            //         title: '申请事由',
-            //         value: '学生生活用品购买'
-            //     },
-            //     {
-            //         title: '申购类型',
-            //         value: '货物申购',
-            //         type: 'type' // 类型字段意味着这是枚举需要自己配置 
-            //     },
-            //     {
-            //         type: 'projects',
-            //         title: '申购明细',
-            //         value: [
-            //             {
-            //                 projectName: '学生冬季校服',
-            //                 count: 20,
-            //                 tags: ['蓝色', '165cm'],
-            //                 money: 56025
-            //             },
-            //             {
-            //                 projectName: '学生冬季校服',
-            //                 count: 30,
-            //                 tags: ['蓝色', '175cm'],
-            //                 money: 65025
-            //             }
-            //         ]
-            //     },
-            //     {
-            //         title: '总金额',
-            //         value: '100000'
-            //     },
-            //     {
-            //         title: '预计申购完成日期',
-            //         value: '2022-11-08'
-            //     },
-            //     {
-            //         type: 'files', // 代表当前是 上传的文件
-            //         title: '附件材料',
-            //         value: [
-            //             {
-            //                 type: 'pdf',
-            //                 name: '采购说明.pdf',
-            //                 size: '264.45KB'
-            //             }
-            //         ]
-            //     },
-            //     {
-            //         type: 'images', // 代表当前是图片组
-            //         title: '图片',
-            //         value: [
-            //             {
-            //                 url: 'http://xxxxx'
-            //             },
-            //             {
-            //                 url: 'http://xxxxx'
-            //             },
-            //             {
-            //                 url: 'http://xxxxx'
-            //             }
-            //         ]
-            //     },
-            //     {
-            //         title: '支付方式',
-            //         value: '银行转账'
-            //     }
-            // ],
 
             pageType: '', // 页面类型 info and approve
             pageFrom: '',
@@ -225,6 +193,11 @@ export default {
             approveCopyList: [],
             dataDetailStatus: -1,
             module: undefined,
+
+
+            showInputResd: false,
+            resd: '', // 评价
+            resdScore: 3, // 评价分
         }
     },
     created() {
@@ -273,6 +246,7 @@ export default {
                 const params = {
                     [paramsId]: this.id
                 }
+
                 const res = await this.apiFunc(params)
                 if (res.code === 1) {
                     this.dataDetail = res.data
@@ -291,79 +265,110 @@ export default {
             }
         },
 
+        // NOTE: 预览图片
+        handleReviewImages(list, idx) {
+            ImagePreview({
+                images: list,
+                startPosition: idx
+            })
+        },
+
         handleBackEvent() {
             console.log('press back btn');
             // NOTE: 通过路由返回
             this.$router.push('/approve')
         },
 
-        // NOTE: 渲染`module_info`字段函数； 让其更好的渲染
-        async formatModuleInfoData(data) {
-            const { module, order_no, module_info, department_data } = data
-            let evectionTypeMap = this.evectionTypeList
-            if (module === 5 && evectionTypeMap) {
-                let vops = evectionTypeMap.filter(option => (option.id === module_info.type))[0]
-                module_info.type_text = vops.name
+        handleSubmitEvaluate() {
+            let comment_score = this.resdScore
+            let comment = this.resd
+            if (!comment) {
+                return this.$store('请填写维修评价')
             }
-            let temporaryList = [
-                {
-                    title: '审批编号',
-                    value: order_no
+
+            approveInfoApi.postEvaluate({
+                comment,
+                comment_score,
+                id: this.dataDetail.id
+            }).then(res => {
+                if (res.code === 1) {
+                    this.$toast(res.msg)
+
+                    this.$nextTick(() => {
+                        this.showInputResd = false
+                        this.__detail__()
+                    })
                 }
-            ]
-            switch (module) {
-                case 5:
-                    temporaryList.push(...[
-                        {
-                            title: '所在部门',
-                            value: department_data.map(department => (department.name)).join('-')
-                        },
-                        {
-                            title: '申请日期',
-                            value: data.create_at
-                            // type: 'date'
-                        },
-                        {
-                            title: '发起人',
-                            value: data.user_id
-                        },
-                        { title: '外出事由', value: module_info.reason },
-                        { title: '同行人员', value: data.peer_user.map(user => (user.name)).join('、') },
-                        { title: '出差开始时间', value: module_info.start_time },
-                        { title: '出差结束时间', value: module_info.end_time },
-
-                        module_info.document_text.length ? {
-                            title: '附件材料',
-                            type: 'files',
-                            value: module_info.document_text
-                        } : undefined,
-
-                        module_info.images_text.length ? {
-                            type: 'images',
-                            title: '图片',
-                            value: module_info.images_text
-                        } : undefined,
-
-                        {
-                            title: '类型',
-                            value: module_info.type_text
-                        },
-                        {
-                            title: '是否跨关内关外',
-                            value: module_info.is_who ? '是' : '否'
-                        },
-                        {
-                            title: module_info.is_who ? '预算金额' : '备注',
-                            value: module_info.remark
-                        }
-                    ])
-                    break
-            }
-            // NOTE: 过滤undefined的数组值
-            temporaryList = temporaryList.filter(row => row)
-            console.log('%c Render Temporary List >>>', 'background: blue; color: #fff', temporaryList.filter(row => row));
-            return Promise.resolve(temporaryList)
-        }
+            })
+        },
+
+        // NOTE: 渲染`module_info`字段函数； 让其更好的渲染
+        // async formatModuleInfoData(data) {
+        //     const { module, order_no, module_info, department_data } = data
+        //     let evectionTypeMap = this.evectionTypeList
+        //     if (module === 5 && evectionTypeMap) {
+        //         let vops = evectionTypeMap.filter(option => (option.id === module_info.type))[0]
+        //         module_info.type_text = vops.name
+        //     }
+        //     let temporaryList = [
+        //         {
+        //             title: '审批编号',
+        //             value: order_no
+        //         }
+        //     ]
+        //     switch (module) {
+        //         case 5:
+        //             temporaryList.push(...[
+        //                 {
+        //                     title: '所在部门',
+        //                     value: department_data.map(department => (department.name)).join('-')
+        //                 },
+        //                 {
+        //                     title: '申请日期',
+        //                     value: data.create_at
+        //                     // type: 'date'
+        //                 },
+        //                 {
+        //                     title: '发起人',
+        //                     value: data.user_id
+        //                 },
+        //                 { title: '外出事由', value: module_info.reason },
+        //                 { title: '同行人员', value: data.peer_user.map(user => (user.name)).join('、') },
+        //                 { title: '出差开始时间', value: module_info.start_time },
+        //                 { title: '出差结束时间', value: module_info.end_time },
+
+        //                 module_info.document_text.length ? {
+        //                     title: '附件材料',
+        //                     type: 'files',
+        //                     value: module_info.document_text
+        //                 } : undefined,
+
+        //                 module_info.images_text.length ? {
+        //                     type: 'images',
+        //                     title: '图片',
+        //                     value: module_info.images_text
+        //                 } : undefined,
+
+        //                 {
+        //                     title: '类型',
+        //                     value: module_info.type_text
+        //                 },
+        //                 {
+        //                     title: '是否跨关内关外',
+        //                     value: module_info.is_who ? '是' : '否'
+        //                 },
+        //                 {
+        //                     title: module_info.is_who ? '预算金额' : '备注',
+        //                     value: module_info.remark
+        //                 }
+        //             ])
+        //             break
+        //     }
+        //     // NOTE: 过滤undefined的数组值
+        //     temporaryList = temporaryList.filter(row => row)
+        //     console.log('%c Render Temporary List >>>', 'background: blue; color: #fff', temporaryList.filter(row => row));
+        //     return Promise.resolve(temporaryList)
+        // }
     },
     beforeDestroy() {
         if (this.isAndroid) {
@@ -375,7 +380,7 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 @import url('@/styles/variables.less');
 
 .examine-detail {
@@ -383,23 +388,61 @@ export default {
         .detail-row {
             margin-bottom: 10px;
         }
+
+        .maintain-result {
+            background-color: #fff;
+            margin-bottom: 10px;
+            padding: 10px 12px;
+
+            .m {
+                &__header {
+                    font-size: 18px;
+                    font-weight: 400;
+                    color: #191A1E;
+                    line-height: 20px;
+                }
+
+                &__msg {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #9A9A9A;
+                    line-height: 20px;
+                    margin: 4px 0;
+                }
+
+                &__imgs {
+                    font-size: 0;
+                    gap: 6px;
+                    flex-wrap: wrap;
+
+                    img {
+                        width: 48px;
+                        height: 48px;
+                        border-radius: 6px;
+                        vertical-align: middle;
+                        overflow: hidden;
+                    }
+                }
+            }
+        }
     }
 
     &__header {
         position: relative;
         padding: 10px 12px;
         background-color: @white;
-        margin-bottom: 6px;
+        margin-bottom: 10px;
 
         .float-status {
             position: absolute;
-            right: 12px;
-            bottom: -30%;
+            right: 22px;
+            bottom: -40%;
             width: 80px;
             height: 80px;
-            background-color: #eee;
-            border-radius: 80px;
-            overflow: hidden;
+
+            img {
+                width: 110%;
+            }
         }
 
         .title {
@@ -411,14 +454,20 @@ export default {
         }
 
         .location {
+            font-size: 0;
+            vertical-align: middle;
+
+            img {
+                width: 20px;
+                height: 20px;
+                vertical-align: middle;
+            }
+
             span {
-                width: 137px;
-                height: 18px;
-                font-size: 12px;
+                font-size: 14px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
                 color: #727273;
-                line-height: 18px;
                 margin-left: 6px;
             }
         }
@@ -450,4 +499,43 @@ export default {
         background-color: @white;
     }
 }
+
+.popup-content {
+    width: 80vw;
+    background-color: #fff;
+    border-radius: 6px;
+    overflow: hidden;
+
+    .layout-container {
+        border-bottom: 1px solid #eee;
+
+        &:nth-last-child(2) {
+            border-bottom: none;
+        }
+    }
+
+    .btn-container {
+        border-top: 10px solid #f2f1f6;
+        padding-bottom: 20px;
+    }
+
+    .btn-span {
+        margin: 0 auto;
+        width: 40%;
+        height: initial !important;
+    }
+}
+
+.maintain-form {
+    margin-bottom: 10px;
+}
+
+.evaluate {
+    padding: 0 10px 10px;
+    font-size: 14px;
+
+    &__event {
+        color: @link-color;
+    }
+}
 </style>

src/views/approve/examine.vue

@@ -1,15 +1,13 @@
 <template>
     <div class="examine-container flex flex-col">
         <div class="examine__input">
-            <van-field
-                v-model="message"
-                rows="26"
-                autosize
-                type="textarea"
-                maxlength="300"
-                placeholder="请输入审批意见"
-                show-word-limit
-            />
+            <van-field v-model="message" :rows="showMaintainBox ? 20 : 26" autosize type="textarea" maxlength="300"
+                placeholder="请输入审批意见" show-word-limit />
+
+            <template v-if="showMaintainBox">
+                <c-select title="维修人员" v-model="maintain_user_id" :list="maintainList" pickerValueKey="name"
+                    pickerValueId="id" />
+            </template>
         </div>
 
         <div class="p-h-12">
@@ -22,46 +20,113 @@
 
 <script>
 
+import CSelect from '../applyfor/components/CSelect.vue'
 import * as dd from 'dingtalk-jsapi'
 
+import * as commonApi from '@/api/common'
+import { putAudit } from '@/api/approve'
+
 export default {
+    components: {
+        CSelect
+    },
     computed: {
-        btnTxt () {
+        btnTxt() {
             let t = this.type
             let s = ''
-            switch(t) {
+            switch (t) {
                 case 'pass':
-                    s =  '确认同意'
+                    s = '确认同意'
                     break;
                 case 'refuse':
-                    s =  '确认拒绝'
+                    s = '确认拒绝'
                     break;
             }
             return s
+        },
+        showMaintainBox() {
+            return this.maintain_type && this.type === 'pass'
         }
     },
-    data () {
+    data() {
         return {
             message: '',
-            type: undefined
+            maintainList: [],
+            maintain_user_id: '',
+            type: undefined,
+
+            maintain_type: '',
+            // showMaintainBox: false
         }
     },
-    created () {
+    created() {
+
         // this.$route.query
         // type: pass通过, refuse拒绝
-        this.type = this.$route.query.type || undefined
+        const { type, maintain_type } = this.$route.query
+
+        this.type = type
+        this.maintain_type = maintain_type
+        if (maintain_type) { // 有类型展示
+            this.__maintain_data__()
+        }
 
         // Set Navigation title and back
-        // dd.xxx
+        // TODO: Set Navigation title and other.
         dd.biz.navigation.setTitle({
             title: this.btnTxt
         })
     },
     methods: {
-        handleResetSignature () {
+        handleResetSignature() {
             let msg = this.message
-            console.log('msg', msg);
+            if (!msg) return this.$toast('请填写审批理由~')
+            this.__put__()
+        },
+
+        /**
+         * 获取维修/信息员工列表
+         */
+        async __maintain_data__() {
+            try {
+                const params = {
+                    type: this.$route.query.maintain_type
+                }
+                const result = await commonApi.getMaintainData(params)
+                if (result.code === 1) {
+                    const data = result.data || []
+                    this.maintainList = data
+                }
+            } catch (error) {
+                console.log('%c maintain-data error >>>', 'background: blue; color: #fff', error);
+            }
         },
+
+        // 同意或者拒绝
+        async __put__() {
+            try {
+                const params = {
+                    approve_id: this.$route.query.id,
+                    status: this.type === 'pass' ? 3 : 4,
+                    remark: this.message,
+                }
+
+                // 维修人员
+                if (this.showMaintainBox && this.maintain_user_id) {
+                    params.maintain_user_id = this.maintain_user_id
+                }
+
+                const result = await putAudit(params)
+
+                if (result.code === 1) {
+                    this.$toast(result.msg)
+                    this.$router.go(-1)
+                }
+            } catch (error) {
+                console.log('%c examine error >>>', 'background: blue; color: #fff', error);
+            }
+
+        }
     }
 }
 </script>
@@ -73,6 +138,11 @@ export default {
         padding-bottom: 20px;
         box-sizing: border-box;
     }
-}
 
+    &__input {
+        .layout-container {
+            margin-top: 10px;
+        }
+    }
+}
 </style>

src/views/approve/feedback-results.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="examine-container flex flex-col">
+    <div class="examine__input">
+      <van-field v-model="message" :rows="20" autosize type="textarea" maxlength="300" placeholder="请输入反馈结果"
+        show-word-limit />
+
+      <c-files ctype="images" v-model="images" />
+    </div>
+
+    <div class="p-h-12">
+      <div class="btnbox" @click="handleResetSignature">
+        <span>确认反馈</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import CFiles from '../applyfor/components/CFiles.vue'
+import * as dd from 'dingtalk-jsapi'
+
+import { postFeedbackResult } from '@/api/approve'
+
+export default {
+  components: {
+    CFiles
+  },
+  data() {
+    return {
+      images: [],
+      message: '',
+    }
+  },
+  created() {
+    // Set Navigation title and back
+    // TODO: Set Navigation title and other.
+    dd.biz.navigation.setTitle({
+      title: this.btnTxt
+    })
+  },
+  methods: {
+    handleResetSignature() {
+      let msg = this.message
+      if (!msg) return this.$toast('请填写反馈理由~')
+
+      this.__put__()
+    },
+
+    // 反馈结果
+    async __put__() {
+      try {
+        const params = {
+          approve_id: this.$route.query.id,
+          feedback: this.message,
+          feedback_images: this.images.map(image => image.url).join(',')
+        }
+
+        const result = await postFeedbackResult(params)
+
+        if (result.code === 1) {
+          this.$toast(result.msg)
+          this.$router.go(-1)
+        }
+      } catch (error) {
+        console.log('%c examine error >>>', 'background: blue; color: #fff', error);
+      }
+
+    }
+  }
+}
+</script>
+<style lang="less">
+.examine {
+  &-container {
+    height: 100vh;
+    justify-content: space-between;
+    padding-bottom: 20px;
+    box-sizing: border-box;
+  }
+
+  &__input {
+    .custom-files-container {
+      margin-top: 10px;
+    }
+  }
+}
+</style>

src/views/approve/procure-info.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="procure-info-container flex flex-col">
+    <div class="main">
+      <div class="main-title">物品明细</div>
+      <div class="projects-box-wrapper" v-for="(item, idx) in list" :key="idx">
+        <div class="projects-box">
+          <div class="projects__header flex flex-row flex-row--aic">
+            <div class="title">{{ item.goods_name }}</div>
+          </div>
+          <div class="projects__footer">
+            <div class="tags flex flex-row flex-row-aic" v-for="(stock, tagidx) in item.goods_stock" :key="tagidx">
+              <span class="category_name">
+                {{ stock.name }}
+              </span>
+              <span class="category_count">x{{ stock.stock }}</span>
+            </div>
+            <div class="money">
+              ￥{{ item.total_price }}
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="footer flex flex-row flex-row-aic">
+      <div class="footer__item flex flex-col" @click="handleDownloadFileEvent">
+        <img :src="require('@/assets/icons-print.png')" alt="">
+        <span>下载文件</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+/**
+ * @name 采购明细详情
+ */
+
+import { SAVE_PROCURE_INFO_TEMPORARY } from '@/utils/constant'
+
+
+export default {
+  name: 'ProcureInfo',
+  data: () => ({
+    list: []
+  }),
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      let arrs = localStorage.getItem(SAVE_PROCURE_INFO_TEMPORARY)
+      if (arrs) {
+        arrs = JSON.parse(arrs)
+        this.list = arrs.map(item => ({
+          ...item,
+          goods_stock: JSON.parse(item.goods_stock)
+        }))
+        console.log('%c list >>>', 'background: blue; color: #fff', this.list);
+      }
+    },
+
+    // NOTE: 下载文件
+    // TODO: 下载文件接口
+    handleDownloadFileEvent() {
+      try {
+        this.$toast('功能迭代中...')
+      } catch (error) {
+        console.log('download file err>>', error);
+      }
+    }
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import url("@/styles/variables.less");
+
+.procure-info-container {
+  padding-top: 10px;
+  height: 100%;
+  box-sizing: border-box;
+
+
+  &>.main {
+    height: 0;
+    flex: 1;
+    overflow: auto;
+    padding: 10px 12px;
+    background-color: #fff;
+  }
+
+  .main-title {
+    font-size: 16px;
+    font-weight: 400;
+    color: #727273;
+    line-height: 30px;
+  }
+
+
+  .footer {
+    padding-top: 10px;
+    padding-bottom: 20px;
+    justify-content: center;
+
+    &__item {
+      align-items: center;
+      justify-content: center;
+
+      img {
+        width: 40px;
+        height: 40px;
+      }
+
+      span {
+        font-size: 14px;
+      }
+    }
+  }
+
+  // 商品明细
+  .projects {
+    &-box-wrapper {
+      padding: 16px 12px;
+      background-color: rgba(248, 248, 248, 1);
+      border-radius: 7px;
+    }
+
+    &-box {
+
+      .title,
+      .category_name {
+        font-size: @font-size-common;
+        font-weight: 400;
+        color: #191A1E;
+        line-height: 18px;
+      }
+
+      &:last-child {
+        .projects__footer {
+          border-bottom: initial;
+          padding-bottom: initial;
+          margin-bottom: initial;
+        }
+      }
+    }
+
+    &__header {
+      justify-content: space-between;
+      padding-bottom: 10px;
+      overflow: hidden;
+    }
+
+    &__footer {
+      padding-bottom: 10px;
+      border-bottom: 1px solid #D8D8D8;
+      margin-bottom: 10px;
+      overflow: hidden;
+
+      .tags {
+        justify-content: space-between;
+        padding: 2px 0;
+
+        .category {
+          &_name {
+            font-size: 14px;
+            color: #868686;
+          }
+
+          &_count {
+            font-size: @font-size-third;
+            font-weight: 400;
+            color: #727273;
+            line-height: 18px;
+          }
+        }
+      }
+
+      .money {
+        font-size: @font-size-common;
+        font-weight: 500;
+        line-height: 18px;
+        padding: 6px 0;
+        color: rgb(244, 86, 66);
+      }
+    }
+  }
+}
+</style>

src/views/approve/search.vue

@@ -2,41 +2,20 @@
     <!-- 搜索页面 -->
     <div class="search-container flex flex-col">
         <div class="filter-container p-h-12 flex flex-row flex-row-aic">
-            <van-field
-                v-model.trim="searchVal"
-                clearable
-                :placeholder="inputPlaceholderText"
-                left-icon="search"
-                @input="handleInputEvent"
-            />
+            <van-field v-model.trim="searchVal" clearable :placeholder="inputPlaceholderText" left-icon="search"
+                @input="handleInputEvent" />
             <div class="filterbox flex flex-row flex-0shrink">
                 <span @click="handleStartSearch">搜索</span>
             </div>
         </div>
         <div class="search-main">
-            <van-list
-                v-model="listLoading"
-                :finished="finished"
-                :finished-text="finishedText"
-                @load="onLoadData"
-                :immediate-check="false"
-            >
-                <approve-item
-                    v-for="(item, idx) in tableData"
-                    :key="idx"
-                    approve-type="xx"
-                    :title="item.__title__"
-                    :time="item.apply_date"
-                    :rows="item.__rows_item__"
-                    :person="item.approve_one.user.name"
-                    :flag="flag"
-                    :flag-state="flagState"
-                />
+            <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData"
+                :immediate-check="false">
+                <approve-item v-for="(item, idx) in tableData" :key="idx" approve-type="xx" :title="item.__title__"
+                    :time="item.apply_date" :rows="item.__rows_item__" :person="item.approve_one.user.name" :flag="flag"
+                    :flag-state="flagState" @click="handleGoInfo(item)" />
             </van-list>
-            <my-empty
-                v-show="showEmpty"
-                tip="暂无数据"
-            />
+            <my-empty v-show="showEmpty" tip="暂无数据" />
         </div>
     </div>
 </template>
@@ -46,12 +25,10 @@ import throttle from 'lodash/throttle'
 
 import ApproveItem from '@/views/approve/components/ApproveItem.vue'
 
-import { getRecordList } from '@/api/approveinfo' 
+import { getRecordList } from '@/api/approveinfo'
 import { getApproveList } from '@/api/approve'
 import { formatApproveItemRow } from '@/utils/approve-item'
 
-
-
 export default {
     name: 'search',
     components: {
@@ -60,18 +37,18 @@ export default {
     computed: {
         // TODO: 缺少相对应的文案
         // NOTE: 输入框的placeholder
-        inputPlaceholderText () {
+        inputPlaceholderText() {
             let placeholder = '请输入申请内容、关键词'
             let ft = Number(this.formType)
-            switch(ft) {
+            switch (ft) {
                 case 5:
                     placeholder = '请输入申请内容、编号'
-                break
+                    break
             }
-            return  placeholder
+            return placeholder
         }
     },
-    data () {
+    data() {
         return {
             formType: '',
             flag: '',
@@ -91,13 +68,12 @@ export default {
         }
     },
 
-    created () {
-        console.log('quers', this.$route.query);
+    created() {
         this.init()
     },
 
     methods: {
-        init () {
+        init() {
             const { formType, flag, flagState } = this.$route.query
             this.formType = Number(formType)
             this.flagState = Number(flagState)
@@ -107,18 +83,16 @@ export default {
 
         handleInputEvent: throttle(function (keyword) {
             console.log('keyword>>>', keyword);
-
             this.tableData = []
             this.listLoading = true
             this.pagination.page = 1
             this.finished = false
             this.showEmpty = false
             this.finishedText = '暂无更多数据了'
-
             this.__getlist__()
         }, 400),
 
-        handleStartSearch () {
+        handleStartSearch() {
             this.tableData = []
             this.listLoading = true
             this.pagination.page = 1
@@ -128,7 +102,7 @@ export default {
             this.__getlist__()
         },
 
-        onLoadData () {
+        onLoadData() {
             // NOTE: 判断刚进入页面不加载
             this.__getlist__()
         },
@@ -137,17 +111,27 @@ export default {
         getParams() {
             const { page, page_num } = this.pagination
             const search = this.searchVal
-            return {
+
+            const params = {
                 page,
                 page_num,
                 search,
-                module: this.formType,
                 status: this.flagState,
             }
+
+            if (this.formType) {
+                params.module = this.formType
+            }
+
+            if (this.flag === 'info') {
+                params.group = 'list'
+            }
+
+            return params
         },
 
         // NOTE: 获取列表
-        async __getlist__ () {
+        async __getlist__() {
             try {
                 const params = this.getParams()
                 const res = await this.apifunc(params)
@@ -159,7 +143,7 @@ export default {
                     list = list.map(item => ({
                         ...item,
                         __title__: `${item.approve_info_user.name}提交的${THAT.$store.getters['enum/getModuleText'](item.type)}`,
-                        __rows_item__: formatApproveItemRow(item, THAT.formType)
+                        __rows_item__: formatApproveItemRow(item, item.module)
                     }))
                     if (list.length < this.pagination.page_num) this.finished = true
                     else {
@@ -171,25 +155,40 @@ export default {
                         this.showEmpty = true
                     }
                 }
-            } catch(e) {
+            } catch (e) {
                 console.log('getlist-error', e);
             }
 
         },
+
+        // NOTE: 详情
+        handleGoInfo(data) {
+            this.$router.replace({
+                name: 'ExamineDetail',
+                query: {
+                    id: data.approve_id,
+                    type: 'approve',
+                    from: `approve_${this.tabVal}`
+                }
+            })
+        },
     }
 }
 </script>
 
 <style lang="less" scoped>
 @import url("@/styles/variables.less");
+
 .search {
     &-container {
         height: 100%;
+
         .filter-container {
             padding-top: 7px;
             padding-bottom: 7px;
             box-sizing: border-box;
             background-color: @white;
+
             .van-cell.van-field {
                 background-color: rgba(238, 238, 239, 1);
                 border-radius: 6px;
@@ -197,8 +196,10 @@ export default {
                 padding-bottom: 6px;
                 position: relative;
             }
+
             .filterbox {
                 padding-left: 10px;
+
                 span {
                     font-size: @font-size-common;
                     font-weight: 500;
@@ -208,9 +209,9 @@ export default {
             }
         }
     }
+
     &-main {
         flex: 1;
     }
 }
-
 </style>