审核是否批准接口

TODO.md

@@ -11,9 +11,9 @@
 ## 前端 TODO
 
 - [ ] 路由标题配置。 通过 dingtalk Set title
-- [x] 我的出差-详情页面缺少 发起人字段
 - [ ] 我的出差-同行人员需要机器测试
 - [ ] 商品库搜索商品接口
+- [ ] 添加/修改抄送人
 
 ## RearEnd Bugs And Todo
 
@@ -25,7 +25,8 @@
 - [x] 呈批申请
   - [x] 提交申请完成
   - [x] 详情渲染完成
-- [x] 各模块提交后渲染字段
+- [x] 各模块提交后渲染字段 (缺少明细字段展示)
+- [x] 商品库搜索商品功能
 
 ## 流程
 

src/store/modules/user.js

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

src/utils/applyfor-item.js

@@ -609,12 +609,15 @@ function getModule11(data) { /* eslint-disable-line */
 
 export const formatApplyforRows = (data) => {
   let type = data.module
+
   if (typeof type !== 'number') type = Number(type)
+
   let arrs = []
-  if (![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(type)) return []
+
+  if (![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].includes(type)) return [];
   const moduleFunc = `getModule${type}`
+  arrs =  eval(`${moduleFunc}(data)`)
 
-  arrs = moduleFunc(data)
   // NOTE: 过滤为undefined字段
   return arrs.filter(item => (item))
 }

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,9 +57,9 @@
                 </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>
@@ -54,6 +69,7 @@
     </div>
 
 
+
     <!-- 提交 -->
     <div class="btn-container" v-if="type === '2'">
       <div class="btn-span" @click="handleConfirmCategory">确定</div>
@@ -125,6 +141,11 @@
       line-height: 18px;
       padding: 10px 0;
     }
+
+    .van-button--primary {
+      background-color: @main-color;
+      border: 1px solid @main-color;
+    }
   }
 
   &__main {
@@ -206,6 +227,22 @@
 
       }
     }
+
+    .search-row {
+      padding: 10px 10px;
+      background-color: #fff;
+
+      &__category {
+        font-size: 12px;
+        color: #8d8c8c;
+        margin-bottom: 8px;
+      }
+
+      &__title {
+        font-size: 16px;
+      }
+
+    }
   }
 }
 
@@ -342,6 +379,7 @@ export default {
     popupVisibility: false,
     productData: [], // 弹出选择商品的数量等。
     choosedStock: null,
+    searchData: [], // 搜索数据存储列表
   }),
 
   created() {
@@ -360,15 +398,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 +414,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()
       }
     },
 
@@ -529,7 +564,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/components/IndexType3.vue

@@ -91,8 +91,6 @@ export default {
             this.selOrd = data.selOrd
             this.remark = data.remark
             this.stock_goods = data.stock_goods || []
-            // this.approve_user: this.approvePeople.map(user => (user.userid || user.emplId)).join(',')
-            // this.copy_user: this.copyPeople.map(user => (user.userid || user.emplId)).join(',')
         },
         /**
          * @description 提交数据默认函数

src/views/approve/examine.vue

@@ -1,15 +1,8 @@
 <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="26" autosize type="textarea" maxlength="300" placeholder="请输入审批意见"
+                show-word-limit />
         </div>
 
         <div class="p-h-12">
@@ -24,29 +17,32 @@
 
 import * as dd from 'dingtalk-jsapi'
 
+import { putAudit } from '@api/approve'
+
 export default {
     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
         }
     },
-    data () {
+    data() {
         return {
             message: '',
+            maintain_user_id: '',
             type: undefined
         }
     },
-    created () {
+    created() {
         // this.$route.query
         // type: pass通过, refuse拒绝
         this.type = this.$route.query.type || undefined
@@ -58,10 +54,35 @@ export default {
         })
     },
     methods: {
-        handleResetSignature () {
+        handleResetSignature() {
             let msg = this.message
             console.log('msg', msg);
         },
+        // 同意或者拒绝
+        async __put__() {
+            try {
+                const params = {
+                    approve_id: this.$route.query.id,
+                    status: this.type === 'pass' ? 3 : 4,
+                    remark: this.message,
+                }
+
+                // 维修人员
+                if (this.$route.query.showm === '1') {
+                    params.maintain_user_id = this.maintain_user_id
+                }
+
+                const result = await putAudit(params)
+                if (result.code === 1) {
+                    console.log('%c printlog >>>', 'background: blue; color: #fff', result.data);
+
+                }
+            } catch (error) {
+                console.log('%c examine error >>>', 'background: blue; color: #fff', error);
+
+            }
+
+        }
     }
 }
 </script>
@@ -74,5 +95,4 @@ export default {
         box-sizing: border-box;
     }
 }
-
 </style>