ignore

TODO.md

@@ -34,12 +34,23 @@
 - [ ] 批量导入接口[导入 excel 文件]缺失, 需要下载相对应的 excel 模板文件接口
 - [ ] 商品库搜索商品接口
 
+--- 2023/12/16 ---
+
+- [ ] 欠缺导入模板说明(采购、领用)
+
 ## Warning
 
 - [ ] 申请详情中的 发起人流程 状态是否需要？
 
 # 今日完成
 
+- [x] 申购导入模板接口调试完成
+- [x] 申购模板下载模板
+
+- [x] 领用导入模板接口调试完成
+- [x] 领用模板下载模板
+- [ ] 领用明细不需要价格 UI
+
 ## 流程
 
 - [ ] 申购申请 module = 1

public/index.html

@@ -15,6 +15,8 @@
     <!-- built files will be auto injected -->
 
 
+
+    <!-- TEMPORARY: vconsole -->
     <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
     <script>
       // VConsole 会自动挂载到 `window.VConsole`

record.md

@@ -0,0 +1,11 @@
+# 深圳市第二特殊教育学校
+
+> h5微应用
+
+```shell
+AgentId=2062807790
+AppKey=dingekepwoyycxfbtyvg
+AppSecret=EjM9WohvKHo3eNqZGGbQHhbjM80QzapdC_f_reYiOCyEFOtaG1qoG2KzEfpSoLWe
+sever=120.79.86.50
+
+```

src/api/common.js

@@ -14,3 +14,26 @@ export const getAuthentication = () => (request({
     method: "POST",
     url: ""
 }))
+
+
+/**
+ * 导入模板路径
+ * @param {Object} data 导入模板路径
+ * @returns Promise
+ */
+export const postImportFile = data => (request({
+    data,
+    method: "POST",
+    url: "common/import"
+}))
+
+/**
+ * 获取导入的模板链接
+ * @param {Object} data 定义导入模板的module
+ * @returns Promise
+ */
+export const getImportTemplate = data => (request({
+    data,
+    method: "POST",
+    url: "common/get_import_template"
+}))

src/main.js

@@ -13,6 +13,12 @@ import App from './App.vue'
 
 import 'amfe-flexible'
 
+if (process.env.NODE_ENV == 'development') {
+  // console.log('%c 开发环境 CONF >>>', 'background: blue; color: #fff', );
+  // import VConsole from 'vconsole'
+  // TODO: 配置开发环境 辅助工具
+}
+
 Vue.config.productionTip = false
 
 new Vue({

src/store/modules/user.js

@@ -11,7 +11,7 @@ const state = {
     mobile: '',
     userinfo: {},
     signatureStateText: '',  // 个签
-    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiI4NSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTY5ODMxMjI4NSwibmJmIjoxNjk4MzEyMjg1LCJleHAiOjE3MjQyMzIyODV9.ziAXs6DiZKGGjtPuaCZ6Vfpv6Ki_deZhFPnDDLjAJUg',
+    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
 }
 
 const getters = {

src/utils/util.js

@@ -44,10 +44,7 @@ export const getStringTye = variable => (Object.prototype.toString.call(variable
 export const getStaticLinkInfo = url => {
     // https://chaoting-washing.oss-cn-zhangjiakou.aliyuncs.com/dd808164257b2fc2/a729087658ff1ef0.pdf
     let regexp = /^(http[s]:\/\/.*\.com)(.*?)(([\w\d\s.]*?)\.(\w*))$/i;
-    console.log('%c getStaticLinkInfo url >>>', 'background: blue; color: #fff', url);
-    
     let matchArrs = url.match(regexp);
-    
     let name = 'unknow'
     let suffix = 'unknow'
     let path = ''

src/views/applyfor/ProductStore.vue

@@ -310,6 +310,7 @@
  *  - 商品单选
  *  - 分类选择
  */
+
 import vueBus from '@/utils/vueBus';
 import CInput from './components/CInput.vue';
 
@@ -333,6 +334,7 @@ export default {
   },
   data: () => ({
     type: "1", // 页面状态。 默认1：商品选择。 可选项2：选择分类
+    module: '', // 进入module不同时有些许差别
     radioCategory: '', // 二级分类Id
     searchVal: '', // 搜索商品?
     categoryData: [], // 分类数据
@@ -352,6 +354,11 @@ export default {
         if (query) {
           // type = 1 // 页面类型。1 => 选择商品。 2 => 选择分类
           if (query.type) this.type = query.type
+
+          // 申请的`module`
+          if (query.module) {
+            this.module = query.module
+          }
         }
 
         await this.__queryCategoay__() // initalization query categray
@@ -437,11 +444,11 @@ export default {
       }
     },
 
-    // NOTE: 选中某商品进行业务
+    // NOTE: 选中商品进行业务
     handleSelectedGoods(item) {
       const { goods_stock } = item
       this.choosedStock = item
-      this.productData = [
+      let temporaryData = [
         {
           label: '规格',
           val: '',
@@ -451,13 +458,19 @@ export default {
           label: '物品数量',
           type: 'total',
           val: ''
-        },
-        {
+        }
+      ]
+
+      // 申购明细时需要物品单价
+      if (['1'].includes(this.module)) {
+        temporaryData.push({
           label: '物品单价',
           type: 'price',
           val: ''
-        }
-      ]
+        })
+      }
+
+      this.productData = temporaryData
       this.popupVisibility = true
     },
 
@@ -512,8 +525,6 @@ export default {
               second: { ...item }
             })
             break
-            // row, item,
-            // NOTE: 选中项这边
           } else continue
         }
       }

src/views/applyfor/components/CFiles.vue

@@ -190,10 +190,6 @@ export default {
                 message: '上传中'
             })
             // NOTE: 上传前的控制
-            // console.log('before read func>>', file);
-            // if ([].includes(file.ctype)) {
-            //     console.log('before read', file);
-            // }
             return true
         },
 
@@ -201,7 +197,7 @@ export default {
         async afterRead(file, detail) {
             console.log('after read', file, detail)
             try {
-                const url = await uploadFile(file.file)
+                const { fullurl: url } = await uploadFile(file.file)
                 const { suffix } = getStaticLinkInfo(url)
                 file.name = file.file.name
                 file.type = suffix

src/views/applyfor/components/CProductStore.vue

@@ -44,12 +44,12 @@
               <div class="prow-middle flex flex-row flex--row-aic" :key="idx">
                 <div class="flex flex-row flex-row-aic">
                   <div class="tags">{{ goodsStock.name }}</div>
-                  <div class="price">￥{{ goodsStock.price }}</div>
+                  <div v-show="needShowPrice" class="price">￥{{ goodsStock.price }}</div>
                 </div>
                 <div class="count">x{{ goodsStock.stock }}</div>
               </div>
             </template>
-            <div class="prow-total">
+            <div class="prow-total" v-show="needShowPrice">
               <span>￥</span>{{ item.goods_stock | sumPrice }}
             </div>
           </div>
@@ -59,14 +59,13 @@
     </template>
     <template v-else>
       <div class="product-store__empty">
-        还未添加领用物品
+        {{ showEmptyTxt }}
       </div>
     </template>
 
-
     <!-- NOTE: 弹窗提示批量导入 -->
     <van-action-sheet v-model="productStoreActionsheetVisibility" :actions="actions" cancel-text="取消"
-      close-on-click-action @cancel="onCancel" @select="handleSelectSheet">
+      close-on-click-action @select="handleSelectSheet">
       <div class="action-sheet-container" slot="description" @click="handleDownloadHelp">
         <div class="icon">
           <img src="" alt="">
@@ -76,8 +75,7 @@
       </div>
     </van-action-sheet>
 
-    <div class="tip" style="font-size: 14px;" @click="handleTips">导入提示</div>
-
+    <!-- NOTE: 上传的触发点 -->
     <input ref="importTemlate" :accept="excelSuffix" type="file" name="file" id="file" @change="handleInputFileChange" />
   </div>
 </template>
@@ -259,10 +257,13 @@
 
 <script>
 
+import { postImportFile, getImportTemplate } from '@/api/common';
 import { excelSuffix } from '@/utils/constant'
+import { downloadFileUseATarget } from '@/utils/util';
 import upload from '@/utils/upload';
 import vueBus from '@/utils/vueBus';
 
+
 export default {
   name: 'CProductStore',
   props: {
@@ -276,6 +277,14 @@ export default {
     }
   },
   computed: {
+    showEmptyTxt() {
+      return `还未添加${this.title}`
+    },
+
+    // NOTE: 只有采购商品时才展示价格等相关内容
+    needShowPrice() {
+      return ['1'].includes(this.type)
+    },
     showList() {
       return Boolean(this.list.length)
     },
@@ -296,8 +305,6 @@ export default {
       return title
     },
     renderInfoList() {
-      console.log('--- renderInfoList??');
-      // if (this.list.length < 2) return this.list
       if (this.showMore) return this.list
       return this.list.slice(0, 2)
     }
@@ -400,13 +407,11 @@ export default {
             }
           ]
         }
+        console.log('%c printlog >>>', 'background: blue; color: #fff', _template_);
+
         this.list = [...this.list, _template_]
       }
     },
-    onCancel() {
-      this.$toast('取消')
-      // Toast('取消');
-    },
 
     handleSelectSheet(action, idx) {
       switch (idx) {
@@ -414,7 +419,6 @@ export default {
           this.handleDownloadTemplate()
           break
         case 1:
-          // this.handleImportFile()
           this.$refs.importTemlate.click()
           break
       }
@@ -422,18 +426,30 @@ export default {
     /**
      * @description 下载文件模板
      */
-    handleDownloadTemplate() {
-      this.$toast('通过a链接下载文件')
-      // downloadFileUseATarget
+    async handleDownloadTemplate() {
+      try {
+        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);
+      }
     },
 
     // listener input:file change
-    handleInputFileChange(event) {
+    async handleInputFileChange(event) {
       let files = event.target.files
       if (files.length) {
         let file = files[0]
         console.log('%c change file >>>', 'background: blue; color: #fff', file);
-        this.handleImportFile(file)
+        await this.handleImportFile(file)
       } else {
         this.$refs.importTemlate.value = ''
       }
@@ -442,48 +458,57 @@ export default {
     // import file
     async handleImportFile(file) {
       try {
+        // update file
         const fileHref = await upload(file)
-        console.log('%c fileHref >>>', 'background: blue; color: #fff', fileHref);
-
-        // TODO: 导入模板Api
-        // const result = await postFileTemplate({
-        //   href: fileHref
-        // })
-        // if (result.code === 1) {
-        //   console.log('%c handleImportFile >>>', 'background: blue; color: #fff', result.data);
-        // }
+
+        // post import file
+        const result = await postImportFile({
+          module: this.type,
+          url: fileHref.url
+        })
+
+        if (result.code === 1) {
+          const { error_list = [], success_list = [] } = result.data
+          if (error_list.length) {
+            // error_list => { msg: String }[]
+            this.handleTipsImport(error_list, success_list)
+          } else if (success_list.length) {
+            this.list = [
+              ...this.list,
+              ...success_list
+            ]
+          }
+        }
       } catch (error) {
         console.log('%c handleImportFileError >>>', 'background: blue; color: #fff', error);
-
       }
 
     },
+
+    // TODO: 批量导入模板说明
     // 下载批量导入说明
     handleDownloadHelp() {
       this.$toast('下载批量导入说明')
       console.log('%c printlog >>>', 'background: blue; color: #fff',);
-      // downloadFileUseATarget
+      // util/downloadFileUseATarget
     },
 
-    handleTips() {
+    // NOTE: 提醒某某商品库存不足。让用户选择是否申领/采购
+    handleTipsImport(errs, arrs) {
       this.$dialog.confirm({
-        message: `
-        1、导入的物品-学生秋季校服商品库不存在
-        2、导入的物品-老师办公用品A4纸商品库不存在
-        3、导入的物品-库存不足，缺少5件
-        `,
+        message: errs.map((item, idx) => `${idx + 1}、${item.msg}}`).join('\t\n'),
         confirmButtonText: '取消申领',
         confirmButtonColor: 'rgba(0, 122, 255, 1)',
         cancelButtonText: '按已有的库存申领'
-      }).then(res => {
-        // TODO: 取消申请
-        console.log(res);
-      }).catch(err => {
-        // TODO: 继续领取
-        console.log(err);
+      }).catch(() => {
+        this.list = [
+          ...this.list,
+          ...arrs
+        ]
       })
     },
 
+    // NOTE: 删除单项
     handleRemoveRow(item, idx) {
       let article = item.goods_name
       this.$dialog.confirm({
@@ -518,9 +543,13 @@ export default {
     // 前往商品库列表
     handleGoPStore() {
       this.$router.push({
-        name: 'ProductStore'
+        name: 'ProductStore',
+        query: {
+          module: this.type
+        }
       })
     },
+
     // NOTE: 添加新商品
     handleAddGoods() {
       this.$store.commit({

src/views/applyfor/components/IndexType1.vue

@@ -62,7 +62,7 @@ export default {
             id: '',
             module: 1,
             reason: '', // 申购事由
-            type: '1', // 采购类型
+            type: '', // 采购类型
             document: [], // 附件
             images: [],
             total_amount: '', // 总金额

src/views/applyfor/components/IndexType4.vue

@@ -47,7 +47,7 @@ export default {
             document: [], // 附件
             remark: '', // 补充说明
 
-            infolist: '', // 明细
+            use_goods: '', // 明细
 
             approve_user: [],
             copy_user: []
@@ -81,7 +81,7 @@ export default {
                 module: this.module,
                 reason: this.reason,
                 remark: this.remark,
-                infolist: this.infolist,
+                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(',')
@@ -95,10 +95,10 @@ export default {
         },
         validate(data) {
             let mapTxt = {
-                'infolist': '领用明细'
+                'use_goods': '领用明细'
             }
             let requiredKey = [
-                'infolist'
+                'use_goods'
             ]
             return this.__validtor__({
                 mapTxt,

src/views/applyfor/goods.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="goods-container flex flex-col">
     <div class="goods__main">
-
-      <!-- NOTE: flag === 3 时、商品分类不展示。因为无法展示禁用状态 -->
-      <!-- <div class="tips">商品编辑不能修改分类</div> -->
+      <!-- NOTE: flag === 3 时、商品分类不展示/无法获取中文枚举（只能通过接口来） -->
       <c-select-imitate v-if="flag === '1'" title="商品分类" :value="goods_category_text" @click="handleClickCategory"
         @clear="handleClearCategory" />