TODO.md

@@ -32,15 +32,19 @@
 ## RearEnd Bugs
 
 - [ ] 批量导入接口[导入 excel 文件]缺失, 需要下载相对应的 excel 模板文件接口
-- [ ] 商品库接口。
-- [ ] 商品库分类接口(2 级) (3 级-带产品)
-- [ ] 根据商品 id 查询详情的接口
+- [x] 商品库接口。
+- [x] 商品库分类接口(2 级) (3 级-带产品)
+- [x] ~~根据商品 id 查询详情的接口~~
 - [ ] 商品库搜索商品接口
 
 -- 2023/12/12 --
 
-- [ ] 分类接口需要根据字段 展示全部分类数据或者 展示有商品的数据
-- [ ] 分类规格数据
+- [x] 分类接口需要根据字段 展示全部分类数据或者 展示有商品的数据
+- [x] 分类规格数据
+
+-- 2023/12/13 --
+
+- [ ] 新增商品。 修改商品时 需要分类中文展示
 
 ## Warning
 

src/router/index.js

@@ -53,6 +53,16 @@ const routes = [
     name: 'Goods',
     component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/goods.vue')
   },
+  {
+    path: '/applyfor/goods-specifications',
+    name: 'GoodsSpeci',
+    component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/goods-specifications.vue')
+  },
+  {
+    path: '/applyfor/goods-unit',
+    name: 'GoodsUnit',
+    component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/goods-unit-price.vue')
+  },
 
   // NOTE：我的审核状态
   {

src/utils/applyfor-item.js

@@ -6,6 +6,17 @@ import store from "@/store"
 // const degree2Txt = store.getters['enum/getDegreeText']
 const maintainTypeList = store.getters['enum/getMaintainText']
 
+function getModule1(data){
+  const { create_at } = data
+  // TODO: 待完成
+  return [
+    {
+      title: '申请日期',
+      value: create_at
+    },
+  ]
+}
+
 function getModule8(data) {
   const { order_no, department_data, module_info} = data
   return [
@@ -50,6 +61,9 @@ export const formatApplyforRows = (data) => {
   let arrs = []
 
   switch (type) {
+    case 1:
+      arrs = getModule1(data)
+      break
     case 8:
       arrs = getModule8(data)
       break

src/utils/approve-item.js

@@ -1,5 +1,5 @@
 /**
- * @description 设置审核Row的数据内容等
+ * @description 设置审核Row的数据内容、我的申请内容数据
  */
 
 import store from "@/store"
@@ -24,7 +24,7 @@ export function formatApproveItemRow(data, type) {
                 },
                 {
                     label: '申购商品',
-                    val: ''
+                    val: data.apply_goods.map(goods => goods.goods_name).join(',')
                 }
             ]
             break

src/utils/import-vant.js

@@ -25,11 +25,12 @@ import {
     ImagePreview,
     Checkbox,
     Radio,
-    RadioGroup
+    RadioGroup,
+    Stepper
 } 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(Uploader).use(Calendar).use(DatetimePicker).use(ActionSheet).use(Switch).use(List).use(Dialog).use(Checkbox).use(Radio).use(RadioGroup).use(Stepper)
 
 
 Vue.use(ImagePreview)

src/views/applyfor/ProductStore.vue

@@ -1,18 +1,19 @@
 <template>
   <div class="product-store-container flex flex-col">
     <div class="product-store__header">
-      <div class="search-box">
+      <div class="search-box" v-if="type === '1'">
         <van-field v-model="searchVal" clearable placeholder="搜索" left-icon="search" @click="handleClickSearchBox" />
       </div>
       <div class="sub-title">
-        <span>商品库</span>
+        <span v-if="type === '2'">请选择商品分类</span>
+        <span v-else>商品库</span>
       </div>
     </div>
 
     <!-- 展示内容 -->
     <div class="product-store__main">
       <van-radio-group v-model="radioCategory">
-        <div class="row" v-for="(item, idx) in tableData" :key="idx">
+        <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">
             <div class="row__header__content">
               {{ item.name }}
@@ -52,6 +53,12 @@
       </van-radio-group>
     </div>
 
+
+    <!-- 提交 -->
+    <div class="btn-container" v-if="type === '2'">
+      <div class="btn-span" @click="handleConfirmCategory">确定</div>
+    </div>
+
     <van-popup class="popup flex flex-col" v-model="popupVisibility" position="bottom" :style="{ height: '60%' }"
       closeable close-icon-position="top-right">
       <div class="popup__header">
@@ -65,6 +72,10 @@
             <c-input :title="item.label" :placeholder="`请输入${item.label}`" :maxlength="5" :showWordLimit="false"
               input-type="digit" v-model="item.val" :key="idx" />
           </template>
+          <template v-else-if="item.type === 'price'">
+            <c-input :title="item.label" :placeholder="`请输入${item.label}`" :maxlength="5" :showWordLimit="false"
+              input-type="number" v-model="item.val" :key="idx" />
+          </template>
           <template v-else>
             <div :key="idx" class="product__row">
               <div class="product__row__header">
@@ -324,7 +335,7 @@ export default {
     type: "1", // 页面状态。 默认1：商品选择。 可选项2：选择分类
     radioCategory: '', // 二级分类Id
     searchVal: '', // 搜索商品?
-    tableData: [], // 分类数据
+    categoryData: [], // 分类数据
     // NOTE: Popup data and context data
     popupVisibility: false,
     productData: [], // 弹出选择商品的数量等。
@@ -385,7 +396,7 @@ export default {
       row.val = item.id
     },
 
-    // 弹窗确认
+    // NOTE: popup confirm 确认数据正常
     handleConfirmInput() {
       try {
         let _list = this.productData
@@ -402,6 +413,9 @@ export default {
         }
 
         // 判断输入的数量是否大于库存
+        if (customCount <= 0) {
+          return this.$toast('物品数量最少1件')
+        }
         if (customCount > ChoosedGoodsStock) {
           return this.$toast('当前商品规格数量不足')
         }
@@ -421,7 +435,6 @@ export default {
       } catch (error) {
         console.log(error);
       }
-
     },
 
     // NOTE: 选中某商品进行业务
@@ -441,7 +454,7 @@ export default {
         },
         {
           label: '物品单价',
-          type: 'total',
+          type: 'price',
           val: ''
         }
       ]
@@ -453,7 +466,7 @@ export default {
       return new Promise((resolve, reject) => {
         goodsApi.category().then(result => {
           if (result.code === 1) {
-            this.tableData = result.data
+            this.categoryData = result.data
             resolve()
           } else {
             reject()
@@ -479,6 +492,32 @@ export default {
           reject(error)
         })
       })
+    },
+
+    // NOTE: 确定选择的分类
+    handleConfirmCategory() {
+      let selId = this.radioCategory
+      let arrs = this.categoryData
+      for (let i = 0; i < arrs.length; i++) {
+        const row = arrs[i];
+        const childlist = row.childlist
+        for (let j = 0; j < childlist.length; j++) {
+          const item = childlist[j];
+          if (selId === item.id) {
+            let first = { ...row }
+            delete first.childlist
+            delete first.expand
+            vueBus.$emit('listenCategoryEvent', {
+              first,
+              second: { ...item }
+            })
+            break
+            // row, item,
+            // NOTE: 选中项这边
+          } else continue
+        }
+      }
+      this.$router.go(-1)
     }
   },
 

src/views/applyfor/components/CFiles.vue

@@ -169,7 +169,15 @@ export default {
         }
     },
 
+    mounted() {
+        this.handleUpdateValues()
+    },
+
     methods: {
+        handleUpdateValues() {
+            const arrs = this.value
+            if (Array.isArray(arrs) && arrs.length) this.filelist = [...arrs]
+        },
         // 启动上传组件
         handleLaunchUploadBox() {
             this.$refs.uploadFileRef.chooseFile()
@@ -240,13 +248,13 @@ export default {
                 }
             }
         },
-        value: {
-            handler(arrs) {
-                if (Array.isArray(arrs) && arrs.length) {
-                    this.filelist = [...arrs]
-                }
-            }
-        }
+        // value: {
+        //     handler(arrs) {
+        //         if (Array.isArray(arrs) && arrs.length) {
+        //             this.filelist = [...arrs]
+        //         }
+        //     }
+        // }
     }
 }
 

src/views/applyfor/components/CProductStore.vue

@@ -37,16 +37,22 @@
                 {{ item.goods_name }}
               </div>
               <div class="prow-header__right">
-                <span class="update" @click="handleUpdateRow">更改</span>
-                <span class="remove" @click="handleRemoveRow">删除</span>
+                <span class="update" @click="handleUpdateRow(item, idx)">更改</span>
+                <span class="remove" @click="handleRemoveRow(item, idx)">删除</span>
               </div>
             </div>
             <template v-for="(goodsStock, idx) in item.goods_stock">
-              <div class="prow-middle flex flex-row flex-row-aic" :key="idx">
-                <div class="tags">{{ goodsStock.name }}</div>
-                <div class="count">x40</div>
+              <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>
+                <div class="count">x{{ goodsStock.stock }}</div>
               </div>
             </template>
+            <div class="prow-total">
+              <span>￥</span>{{ item.goods_stock | sumPrice }}
+            </div>
           </div>
 
         </div>
@@ -221,11 +227,32 @@
       }
 
       &-middle {
-        padding: 3px 0;
+        padding: 5px 0;
         justify-content: space-between;
         font-size: @font-size-common;
         font-weight: 400;
         color: #727273;
+
+        >div:first-child {
+          .price {
+            font-size: 14px;
+            margin-left: 10px;
+            vertical-align: text-bottom;
+          }
+        }
+      }
+
+      &-total {
+        span {
+          font-size: 12px;
+          vertical-align: baseline;
+        }
+
+        padding-top: 6px;
+        font-size: 16px;
+        font-weight: 400;
+        color: #F45642;
+        line-height: 24px;
       }
     }
   }
@@ -289,33 +316,71 @@ export default {
   }),
 
   created() {
+    // 商品库选择
     vueBus.$on('updateProductList', this.handleUpdateList)
+
+    // 添加/更新商品
+    vueBus.$on('changeGoods', this.handleAddOrUpdateData)
   },
 
   deactivated() {
     console.log('页面隐藏？');
   },
 
+  mounted() {
+    this.handleUpdateValues()
+  },
+
   methods: {
 
+    handleUpdateValues() {
+      const arrs = this.value
+      if (Array.isArray(arrs) && arrs.length) this.list = [...arrs]
+    },
+
     handleTest() {
       this.list.push({ name: 1 })
     },
+
+    // NOTE: 处理新增和修改商品
+    // 更新  flag = 3。 新增 flag = 1
+    handleAddOrUpdateData(data) {
+      console.log('%c add & update data >>>', 'background: blue; color: #fff', data);
+
+    },
     // NOTE: 商品库选择数据
     handleUpdateList(data) {
       const { customCount, goodsStock, item, GoodsPrice } = data
       console.log('handleUpdateList', customCount, goodsStock, item, GoodsPrice);
-
-      let isHasGoods = this.list.some(goods => goods.id === item.id)
-
-      // TODO: 优先判断是否存在该商品。不存在新增。 存在添加到商品`goos_stock`中
+      const isHasGoods = this.list.some(goods => goods.goods_id === item.id)
       if (isHasGoods) {
-        let idx = this.list.findIndex(goods => goods.id === item.id)
-        console.log('%c query idx >>>', 'background: blue; color: #fff', idx);
+        let idx = this.list.findIndex(goods => goods.goods_id === item.id)
+        const { goods_stock } = this.list[idx]
+        // 判断是否以添加规格
+        let hasGoodsStock = goods_stock.some(standard => standard.id === goodsStock.id)
+        if (hasGoodsStock) {
+          let _idx = goods_stock.findIndex(standard => standard.id === goodsStock.id)
+          if (_idx >= 0) {
+            goods_stock[_idx] = {
+              ...goods_stock[_idx],
+              price: GoodsPrice,
+              stock: customCount
+            }
+          }
+        } else {
+          goods_stock.push({
+            id: goodsStock.id,
+            name: goodsStock.name,
+            price: GoodsPrice,
+            stock: customCount
+          })
+        }
+        this.$forceUpdate()
       } else {
         const _template_ = {
           flag: 3,
           id: item.id,
+          goods_id: item.id,
           goods_category_first: item.goods_category_first,
           goods_category_id: item.goods_category_id,
           goods_no: item.goods_no,
@@ -323,7 +388,7 @@ export default {
           goods_brand: item.goods_brand,
           goods_stock: [
             {
-              id: goodsStock.goods_id,
+              id: goodsStock.id,
               name: goodsStock.name,
               price: GoodsPrice,
               stock: customCount
@@ -414,18 +479,16 @@ export default {
       })
     },
 
-    handleRemoveRow() {
-      let article = '学生秋冬季节校服样式二'
+    handleRemoveRow(item, idx) {
+      let article = item.goods_name
       this.$dialog.confirm({
-        title: '删除领用物品',
+        title: `删除${this.title}`,
         message: `请确认是否删除“${article}”的信息`,
         confirmButtonText: '否',
         confirmButtonColor: '#576B95',
         cancelButtonText: '是'
-      }).then(res => {
-        this.$toast(res)
-      }).catch(err => {
-        this.$toast(err)
+      }).catch(() => {
+        this.list.splice(idx, 1)
       })
     },
 
@@ -447,15 +510,38 @@ export default {
     },
     // NOTE: 添加新商品
     handleAddGoods() {
-      this.$toast('添加商品页面')
-      this.$router.push({
-        name: 'Goods'
+      this.$store.commit({
+        type: "app/ROUTE_ADD",
+        value: "Goods"
       })
+      this.$nextTick(() => {
+        this.$router.push({
+          name: 'Goods'
+        })
+      })
+    }
+  },
+  filters: {
+    // NOTE: 累加器
+    sumPrice(arrs) {
+      let sum = 0
+      return arrs.reduce((accumulator, cur) => (accumulator + (Number(cur.price) * Number(cur.stock))), sum)
+    },
+  },
+  watch: {
+    list: {
+      handler(arrs) {
+        if (Array.isArray(arrs) && arrs.length) {
+          this.$listeners['input'] && this.$emit('input', arrs)
+        }
+      }
+
     }
   },
   beforeDestroy() {
     console.log('%c destory $off updateProductList >>>', 'background: blue; color: #fff',);
     vueBus.$off('updateProductList')
+    vueBus.$off('changeGoods')
   },
 }
 </script>

src/views/applyfor/components/CSelectImitate.vue

@@ -0,0 +1,74 @@
+<template>
+    <layout :title="$attrs.title" :required="$attrs.required">
+        <div class="custom-select-container flex flex-row flex-row-aic">
+            <div class="left" @click="$emit('click')">
+                <div v-if="value" class="value">{{ value }}</div>
+                <div v-else class="default">{{ placeholder }}</div>
+            </div>
+            <div class="right">
+                <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>
+        </div>
+    </layout>
+</template>
+
+<script>
+/**
+ * @description 当前组件只为展示UI和数据。
+ */
+import Layout from './Layout.vue';
+export default {
+    name: 'CSelectImitate',
+    components: {
+        Layout
+    },
+
+    props: {
+        value: {
+            type: String,
+            default: ''
+        },
+        placeholder: {
+            type: String,
+            default: '请选择'
+        }
+    },
+
+    data: () => ({
+
+    })
+}
+</script>
+
+<style lang="less" scoped>
+.custom-select {
+    &-container {
+        justify-content: space-between;
+
+        .left {
+            flex: 1;
+
+            .value {
+                font-size: 14px;
+                font-weight: 400;
+                color: #1A1A1F;
+                line-height: 20px;
+            }
+
+            .default {
+                font-size: 14px;
+                font-weight: 400;
+                color: #727273;
+                line-height: 20px;
+            }
+        }
+
+        .right {
+            .van-icon {
+                margin-left: 2px;
+            }
+        }
+    }
+}
+</style>

src/views/applyfor/components/IndexType1.vue

@@ -1,5 +1,8 @@
 <template>
     <div class="type6-container">
+        <div class="btn-container" @click="handleNavRightBack">
+            <div class="btn-span">我的</div>
+        </div>
         <c-input title="申请事由" :required="true" input-type="textarea" :maxlength="800" v-model="reason" />
 
         <c-select title="采购类型" :required="true" v-model="type" :list="applyTypeList" pickerValueKey="name"
@@ -7,7 +10,7 @@
 
         <!-- NOTE: 只有货物采购才有 采购明细 -->
         <template v-if="type == '1'">
-            <c-product-store v-model="apply_goods" type="1" />
+            <c-product-store ref="productStoreRef" v-model="apply_goods" type="1" />
         </template>
 
         <c-input title="总金额（元）" :required="true" v-model="total_amount" />
@@ -16,7 +19,7 @@
 
         <c-files v-model="document" />
 
-        <c-files ctype="images" v-model="images" />
+        <c-files ref="imageRef" ctype="images" v-model="images" />
 
         <c-select title="支付方式" :required="true" :list="applyPayTypeList" v-model="pay_type" pickerValueKey="name"
             pickerValueId="id" />
@@ -54,8 +57,8 @@ export default {
             applyTypeList: this.$store.state.enum.applyTypeList,
             applyPayTypeList: this.$store.state.enum.applyPayTypeList,
 
-            // TODO: 缺少拟稿部门、落款选择数据列表
             // formData start
+            way: 'create',
             id: '',
             module: 1,
             reason: '', // 申购事由
@@ -78,9 +81,70 @@ 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);
+            console.log('%c edit data type1 >>>', '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.reason = data.reason
+            this.type = data.type
+
+            const mif = data.module_info
+
+            this.total_amount = `${Number(mif.total_amount)}`
+            this.pay_type = mif.pay_type
+
+            if (mif.apply_date) {
+                this.apply_date = mif.apply_date
+            }
+
+            this.apply_goods = data.apply_goods.map(goods => ({
+                flag: 3, // NOTE: 默认接口返回数据是商品库来的
+                ...goods,
+                goods_stock: JSON.parse(goods.goods_stock)
+            }))
+
+            if (data.module_info.images) {
+                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
+            //     }))
+            // }
+            // NOTE: 主动触发子组件渲染
+            this.$nextTick(() => {
+                this.$refs.productStoreRef.handleUpdateValues()
+                this.$refs.imageRef.handleUpdateValues()
+            })
         },
         /**
          * @description 提交数据默认函数
@@ -96,20 +160,27 @@ export default {
 
         __format_data__() {
             let templateObj = {
+                way: this.way,
                 module: this.module,
                 reason: this.reason,
                 type: this.type,
                 total_amount: this.total_amount,
                 pay_type: this.pay_type,
                 apply_date: this.apply_date,
-
+                apply_goods: this.apply_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
@@ -119,14 +190,14 @@ export default {
             let mapTxt = {
                 'reason': '申购事由',
                 'type': '采购类型',
-                // 申购明细
+                'apply_goods': '申购明细',
                 'total_amount': '总金额',
                 'pay_type': '支付方式'
             }
             let requiredKey = [
                 'reason',
                 'type',
-                // 申购明细
+                'apply_goods',
                 'total_amount',
                 'pay_type'
             ]
@@ -142,17 +213,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

@@ -1,5 +1,32 @@
+<template>
+  <div class="specifications-container">
+    <div class="main">
+      <!-- 规格示例 -->
+      <div class="addbtn">
+        <van-icon name="plus" :size="18" />
+        添加规格
+      </div>
+      <!-- 内容 -->
+    </div>
+
+    <!-- btn -->
+    <div class="btn-container">
+      <div class="btn-span">提交</div>
+    </div>
+  </div>
+</template>
 <script>
 /**
  * @description 商品规格页面
  */
+export default {
+  name: 'GoodsSpeci',
+  data: () => ({
+    standars: []
+  }),
+  created() {
+    console.log('%c standars >>>', 'background: blue; color: #fff', this.$route.query.standars);
+
+  },
+}
 </script>

src/views/applyfor/goods.vue

@@ -1,31 +1,20 @@
 <template>
   <div class="goods-container flex flex-col">
     <div class="goods__main">
+      <c-select-imitate title="商品分类" :value="goods_category_text" @click="handleClickCategory"
+        @clear="handleClearCategory" />
 
-      <!-- TODO: 商品分类是否可以采用数据多级别联动。 不跳转页面 -->
-      <c-select
-        title="商品分类"
-      />
+      <c-input title="商品编号" v-model="goods_no" />
 
-      <c-input
-        title="商品编号"
-      />
+      <c-input title="商品名称" v-model="goods_name" />
 
-      <c-input
-        title="商品名称"
-      ></c-input>
+      <c-input title="商品品牌" v-model="goods_brand" />
 
-      <c-input
-        title="商品品牌"
-      ></c-input>
+      <c-select-imitate title="商品规格" :value="goodsStandarsTxt" @click="handleClickStandards"
+        @clear="handleClearStandards" />
+      <c-select-imitate title="单价及数量设置" :value="goodsStandarsTxt" @click="handleClickCategory"
+        @clear="handleClearStandards" />
 
-      <c-select
-        title="商品规格"
-      />
-
-      <c-select
-        title="单价及数量设置"
-      />
     </div>
 
     <div class="goods__footer">
@@ -41,13 +30,16 @@
   &-container {
     height: 100vh;
     justify-content: space-between;
+
     .layout-container {
       margin-top: 10px;
     }
+
     .btn-container {
       margin-top: initial;
     }
   }
+
   &__main {
     height: 0;
     flex: 1;
@@ -61,24 +53,97 @@
  * @description 添加商品/修改商品页
  * @date 2023/11/30
  * @param flag = edit 表示修改
- * @param goodsId = xxx 商品Id
+ * @param goods_id = xxx 商品Id
  */
 
+import vueBus from '@/utils/vueBus';
 import CInput from './components/CInput.vue';
 import CSelect from './components/CSelect.vue';
+import CSelectImitate from './components/CSelectImitate.vue'
 
 export default {
   name: 'Goods',
   name_cn: '商品', // 新增或修改商品单项时存在
   components: {
     CInput,
-    CSelect
+    CSelect,
+    CSelectImitate
+  },
+  computed: {
+    goodsStandarsTxt() {
+      if (this.standars.length) {
+        return `共${this.standars.length}个规格`
+      } else {
+        return ''
+      }
+    }
   },
   data: () => ({
-    flag: 'new', // 默认是新增
+    flag: '1', // 默认是新增:1 修改：3
+    id: '', // 与goods_id 相同
     goodsId: undefined, // 商品id
+    goods_category_first: '',
+    goods_category_id: '',
+    goods_category_text: '',
+    goods_no: '',
+    goods_name: '',
+    goods_brand: '',
+    standars: [], // string[]
+    goods_stock: [] // object[]
   }),
+  created() {
+    vueBus.$on('listenCategoryEvent', this.handleCategoryData)
+    vueBus.$on('listenStrandarsEvent', this.handleStandarsData)
+  },
   methods: {
+    handleClickCategory() {
+      this.$router.push({
+        name: 'ProductStore',
+        query: {
+          type: '2'
+        }
+      })
+    },
+    handleClearCategory() {
+      this.goods_category_first = ''
+      this.goods_category_id = ''
+      this.goods_category_text = ''
+    },
+    // NOTE: 处理商品分类数据
+    handleCategoryData(data) {
+      const { first, second } = data
+      this.goods_category_text = `${first.name}/${second.name}`
+      this.goods_category_first = first.id
+      this.goods_category_id = second.id
+    },
+    handleClickStandards() {
+      this.$router.push({
+        name: 'GoodsSpeci',
+        query: {
+          standars: this.standars.join(',')
+        }
+      })
+    },
+    handleClearStandards() {
+      this.standars = []
+    },
+    // NOTE: 更新规格数据
+    handleStandarsData(data) {
+      this.standars = data.value
+    },
+
+    handleClickUnit() {
+      this.$router.push({
+        name: 'GoodsUnit',
+        query: {
+          standars: this.standars.join(',')
+        }
+      })
+    }
+
+  },
+  beforeDestroy() {
+    vueBus.$off('listenCategoryEvent')
   }
 }
 </script>

src/views/approve/components/ApproveControl.vue

@@ -74,10 +74,11 @@ export default {
                     case 2:
                         temparr = [
                             urging,
-                            // {
-                            //     ...edit,
-                            //     disable: true
-                            // },
+                            // TEMPORARY: 临时取消注释展示
+                            {
+                                ...edit,
+                                disable: false
+                            },
                             revoke,
                             print
                         ]

src/views/approve/detail.vue

@@ -211,7 +211,7 @@ export default {
             //     },
             //     {
             //         title: '支付方式',
-            //         value: '银行转账' // NOTE: 转账方式理论上来讲也是一套枚举
+            //         value: '银行转账'
             //     }
             // ],