chore:init

src/components/newReport/src/order.vue

@@ -2,17 +2,17 @@
   <div class="SalesReportRejectedNew" v-loading="loading">
     <el-table :data="tableData" size="mini" border>
       <el-table-column prop="name" width="120px" />
-      <el-table-column label="备库">
+      <el-table-column label="库存商品">
         <template slot-scope="scope">
           {{ getResultWithType(scope.row,'1') }}
         </template>
       </el-table-column>
-      <el-table-column label="非库存">
+      <el-table-column label="非库存商品">
         <template slot-scope="scope">
         {{ getResultWithType(scope.row, '2') }}
         </template>
       </el-table-column>
-      <el-table-column label="咨询采反">
+      <el-table-column label="反馈商品">
         <template slot-scope="scope">
           {{ getResultWithType(scope.row, '3') }}
         </template>
@@ -107,7 +107,7 @@ export default {
             return row
         },{...defaultData})}
 
-        
+
         this.tableData.push(totalItem)
 
       } else {

src/components/newReport/src/purchase.vue

@@ -3,9 +3,9 @@
     <el-table :data="tableData" size="mini" border>
       <el-table-column label="业务公司" prop="cgder" width="200px" />
       <el-table-column width="110px" label="采购单总量" prop="total_cgd" />
-      <el-table-column label="库存品" prop="tag_1" />
-      <el-table-column label="非库存品" prop="tag_2" />
-      <el-table-column label="采返" prop="tag_zx"/>
+      <el-table-column label="库存商品" prop="tag_1" />
+      <el-table-column label="非库存商品" prop="tag_2" />
+      <el-table-column label="反馈商品" prop="tag_zx"/>
       <el-table-column label="TOC" prop="tag_c" />
       <el-table-column label="TOB" prop="tag_b" />
     </el-table>

src/components/newReport/src/sendExp.vue

@@ -5,17 +5,19 @@
         <!-- <el-date-picker
           :pickerOptions="pickerOptions"
           style="width:150px"
-          v-model="day" 
-          size="mini" 
-          type="date" 
-          placeholder="截止日期" 
-          @change="handleChange" 
+          v-model="day"
+          size="mini"
+          type="date"
+          placeholder="截止日期"
+          @change="handleChange"
         /> -->
     </div>
 
     <el-table :data="tableData" size="mini" border :span-method="objectSpanMethod">
       <el-table-column width="70px" label="部门" prop="name" />
-      <el-table-column width="90px" show-overflow-tooltip label="商品类型" prop="0" />
+      <el-table-column width="90px" label="商品类型"  prop="0">
+        <template slot-scope="scope">{{getType(scope.row["0"])}}</template>
+      </el-table-column>
       <el-table-column label="时效" align="center">
         <el-table-column label="A24小时" prop="1" />
         <el-table-column label="B48小时" prop="2" />
@@ -78,6 +80,14 @@ export default {
     // this.searchList();
   },
   methods: {
+    getType(sourceType){
+      const mapType = {
+        '库存品':'库存商品',
+        '咨询采返':'反馈商品',
+        '非库存品':'非库存商品'
+      }
+      return mapType[sourceType] || sourceType;
+    },
     getTotal(row){
       const keys = ['1','2','3','4','5','6']
       return keys.reduce((prev, key) => (
@@ -177,7 +187,7 @@ export default {
 
         totalItem['name'] = '合计'
         totalItem['0'] = '--'
-        list.push(totalItem)  
+        list.push(totalItem)
 
         this.tableData = list
 

src/components/newReport/src/sendOrder.vue

@@ -5,18 +5,20 @@
       <!-- <el-date-picker
         :pickerOptions="pickerOptions"
         style="width:150px"
-        v-model="day" 
-        size="mini" 
-        type="date" 
-        placeholder="截止日期" 
-        @change="handleChange" 
+        v-model="day"
+        size="mini"
+        type="date"
+        placeholder="截止日期"
+        @change="handleChange"
       /> -->
     </div>
 
     <el-table :data="tableData" size="mini" border :span-method="objectSpanMethod">
       <el-table-column label="部门" width="70"   prop="name">
       </el-table-column>
-      <el-table-column width="90px" label="商品类型"  prop="0"  />
+      <el-table-column width="90px" label="商品类型"  prop="0">
+        <template slot-scope="scope">{{getType(scope.row["0"])}}</template>
+      </el-table-column>
       <el-table-column label="时效" align="center">
         <el-table-column label="A24小时" prop="1" />
         <el-table-column label="B48小时" prop="2" />
@@ -76,6 +78,14 @@ export default {
     // this.searchList();
   },
   methods: {
+    getType(sourceType){
+      const mapType = {
+        '库存品':'库存商品',
+        '咨询采返':'反馈商品',
+        '非库存品':'非库存商品'
+      }
+      return mapType[sourceType] || sourceType;
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
         //合并相同的名字

src/pages/stock.vue

@@ -4,7 +4,7 @@
       <!-- <div style="display:flex;justify-content:flex-end">
         <period-date-picker :start="date[0]" :end="date[1]" size="mini" width="150px" @timeReturned="time($event)" />
       </div> -->
-    
+
       <el-row :gutter="20">
         <el-col :xs="24">
           <not-deliver-good :title="'1.无地址销售订单统计'" :date="date" />
@@ -117,7 +117,7 @@ export default {
        this.state.loading = true;
        const openid = getOpenid()
        const code = getParameterByName('code')
-       const result = await userRequest.userinfo({ 
+       const result = await userRequest.userinfo({
           ...( openid ? { openid } :  { code })
         })
 
@@ -160,7 +160,7 @@ export default {
 		  //     "updatetime": "2023-05-09 16:22:33"
       // 	}
       // }
-      
+
         this.state.loading = false
         switch(Number(result.code)){
           case 0: