feat: part code

TODO.md

@@ -4,24 +4,18 @@
 
 - [x] 上传文件/图片等模块
 - [x] 下载文件通过链接下载 (等待测试)
-
+- [x] 商品规格页面
+- [x] 抄送人超过三个时显示状态需要更新
+- [x] 商品单价页面
 - [ ] 路由标题配置。 通过 dingtalk Set title
-
-- [ ] 抄送人超过三个时显示状态需要更新
-
 - [ ] 我的出差-详情页面缺少 发起人字段
-
-- [ ] 商品规格页面
-
-- [ ] 商品单价页面
+- [ ] 我的出差-同行人员需要机器测试
 
 ### 缺少明细的页面
 
-- 申购 1 - 欠缺导入功能
 - 入库 3
-- 领用（已添加 4
 
-## About Ui
+## Uiiiiii lack todo
 
 - [ ] 个人中心`tag`Icons 需要补充
 - [ ] 个人中心头像和签名图片是走钉钉功能。 尚未自测
@@ -31,29 +25,23 @@
 
 ## RearEnd Bugs
 
-- [ ] 批量导入接口[导入 excel 文件]缺失, 需要下载相对应的 excel 模板文件接口
 - [ ] 商品库搜索商品接口
 
---- 2023/12/16 ---
-
-- [ ] 欠缺导入模板说明(采购、领用)
+--- 2023/12/18 ---
 
-## Warning
-
-- [ ] 申请详情中的 发起人流程 状态是否需要？
+- [ ] 申请人数据渲染时。 缺少中文对应的字段展示
 
 # 今日完成
 
-- [x] 申购导入模板接口调试完成
-- [x] 申购模板下载模板
-
-- [x] 领用导入模板接口调试完成
-- [x] 领用模板下载模板
-- [ ] 领用明细不需要价格 UI
+- [x] 领用明细不需要价格 UI
+- [x] 领用申请成功提交 (添加导入，商品库选择等)
 
 ## 流程
 
 - [ ] 申购申请 module = 1
+- [x] 领用申请 module = 4 提价申请完成
+  - [ ] 明细报错
+- [x] 出差申请 module = 5
 - [x] 维修流程 module = 8
 - [ ] 合同呈批 module = 9
 

src/store/modules/user.js

@@ -11,7 +11,12 @@ const state = {
     mobile: '',
     userinfo: {},
     signatureStateText: '',  // 个签
+
+    // 徐同泽
     token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
+
+    // 张鑫楷
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ5MiwibmJmIjoxNzAyNjk3NDkyLCJleHAiOjE3Mjg2MTc0OTJ9.tvPS5OIrfn21LItFuUSiKgnAUu1p-9x5xwzVzxp6y20'
 }
 
 const getters = {

src/utils/applyfor-item.js

@@ -12,12 +12,12 @@ const getapplyTypeText = store.getters["enum/getapplyTypeText"]
 
 function getModule1(data){
   const { order_no, department_data, create_at, module_info, apply_user } = data
-  // TODO: 待完成
   return [
     {
       title: '审批编号',
       value: order_no
     },
+    // TODO: 合同编号
     // 合同编号
     {
       title: '所在部门',
@@ -43,7 +43,7 @@ function getModule1(data){
     // 申购明细
     {
       title: '总金额',
-      value: module_info.total_amount
+      value: module_info.total_amount || '-'
     },
     {
       title: '预计申购完成日期',

src/utils/approve-item.js

@@ -5,6 +5,7 @@
 import store from "@/store"
 
 const degree2Txt = store.getters['enum/getDegreeText']
+const getapplyTypeText = store.getters["enum/getapplyTypeText"]
 
 export function formatApproveItemRow(data, type) {
     if (typeof type !== 'number') type = Number(type)
@@ -20,12 +21,14 @@ 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:
@@ -105,5 +108,6 @@ export function formatApproveItemRow(data, type) {
             ]
             break
     }
-    return arrs
+
+    return arrs.filter(item => item)
 }

src/views/applyfor/components/CProductStore.vue

@@ -485,7 +485,7 @@ export default {
 
     },
 
-    // NOTE: 下载批量导入说明
+    // XXX: 下载批量导入说明
     // Useless. 功能忽略
     handleDownloadHelp() {
       // util/downloadFileUseATarget
@@ -495,7 +495,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 +533,7 @@ export default {
           name: 'Goods',
           query: {
             flag: '3',
+            type: this.type,
             edit: JSON.stringify(item)
           }
         })

src/views/applyfor/components/IndexType1.vue

@@ -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,7 +123,7 @@ export default {
                 data
             })
         },
-        async __post__ (data) {
+        async __post__(data) {
             try {
                 const res = await this.postApi(data)
                 if (res.code === 1) {
@@ -172,7 +140,7 @@ export default {
                     */
 
                 }
-            } 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

src/views/applyfor/components/IndexType2.vue

@@ -43,6 +43,7 @@ export default {
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 2,
             reason: '', // 申请标题
@@ -82,6 +83,7 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 type: this.type,
@@ -94,8 +96,15 @@ export default {
                 copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
             }
 
-            // TODO: 格式化尚未完成
-            // document
+            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

src/views/applyfor/components/IndexType3.vue

@@ -47,6 +47,7 @@ export default {
             degreeList: this.$store.state.enum.degreeList,
 
             // formData start
+            way: 'create', // create/update/edit
             id: '',
             module: 3,
             document: [], // 附件
@@ -85,6 +86,7 @@ export default {
         },
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
 
                 selOrd: this.selOrd,
@@ -95,9 +97,15 @@ export default {
                 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

src/views/applyfor/components/IndexType4.vue

@@ -2,7 +2,7 @@
     <div class="type6-container">
         <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 +41,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: []
@@ -78,17 +79,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

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
+            this.apply_user_id = data.apply_user_id
+
+            // 申请人Id 对应 中文字段 // TODO: 中文对应字段
+            // 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: 设置标题等
@@ -169,16 +200,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);
@@ -204,7 +228,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 +237,7 @@ export default {
         },
         __format_data__() {
             let params = {
+                way: this.way,
                 module: 5,
                 reason: this.reason, // 申请理由
                 start_time: this.start_time, // 开始时间
@@ -231,7 +256,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" />
@@ -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,12 @@ 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
+        }
     },
 
     methods: {
@@ -93,7 +108,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
+            this.apply_user_id = data.apply_user_id
+
+            // 申请人Id 对应 中文字段 // TODO: 中文对应字段
+            // 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 +148,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 +169,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
         },

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
+            this.apply_user_id = data.apply_user_id
+
+            // 申请人Id 对应 中文字段 // TODO: 中文对应字段
+            // 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,13 @@ 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(','),
             }
             if (this.start_time) {
                 const [date, amOrPm] = this.start_time.split(' ')
@@ -125,9 +149,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) {

src/views/applyfor/components/IndexType9.vue

@@ -101,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

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-show="$route.query.showPrice" 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>
 
       <!-- 规格示例 -->
@@ -162,12 +162,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

@@ -134,6 +134,8 @@ 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)
         }
       })

src/views/approve/components/ApproveFlowPath.vue

@@ -14,10 +14,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">