11/12 13:52

11

src/constant/index.js

@@ -112,3 +112,8 @@ export const auditPaymentType = {
   MUSIC_APPLY: '乐团报名',
   MUSIC_RENEW: '乐团续费'
 }
+
+export const orderServerType = {
+  SERVICE: '服务收入',
+  SELL: '销售收入'
+}

src/views/businessManager/orderManager/financeManager.vue

@@ -280,15 +280,13 @@
                          :value="item.id"></el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="金额(元)"
-                        prop="actualAmount"
+          <el-form-item label="学员编号"
+                        prop="userId"
                         :label-width="formLabelWidth">
-            <el-input v-model="form.actualAmount"
-                      type="number"
-                      @mousewheel.native.prevent
-                      v-number
-                      placeholder="请输入金额"></el-input>
-          </el-form-item> -->
+            <el-input v-model.trim="form.userId"
+                      :disabled="!isAdd"
+                      placeholder="请输入学员编号"></el-input>
+          </el-form-item>
           <div class="lookTitle">交易信息</div>
           <el-form-item label="交易流水号"
                         prop="transNo"
@@ -319,6 +317,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="收入类型"
+                        v-if="isAdd"
                         :label-width="formLabelWidth"
                         prop="applyType">
             <el-select class="multiple"
@@ -334,7 +333,8 @@
                          :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="销售金额"
+          <el-form-item label="销售金额"
+                        v-if="form.applyType == 'SELL' || !isAdd"
                         prop="goodsAmount"
                         :label-width="formLabelWidth">
             <el-input v-model="form.goodsAmount"
@@ -342,8 +342,9 @@
                       type="number"
                       :disabled="!isAdd"
                       placeholder="请输入销售金额" />
-          </el-form-item> -->
-          <el-form-item label="收入金额"
+          </el-form-item>
+          <el-form-item label="服务金额"
+                        v-if="form.applyType == 'SERVICE' || !isAdd"
                         prop="serviceAmount"
                         :label-width="formLabelWidth">
             <el-input type="number"
@@ -471,7 +472,7 @@ export default {
       organList: [],
       shopList: [],
       cooperationList: [],
-      orderServerList,
+      orderServerList: orderServerList,
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -501,7 +502,8 @@ export default {
           id: null,
           number: null
         }],
-        applyType: null
+        applyType: null,
+        userId: ''
       },
       validAmount: [
         { required: true, validator: validAmount, trigger: 'blur' },
@@ -533,6 +535,7 @@ export default {
     }
   },
   mounted () {
+    console.log(this.orderServerList)
     getEmployeeOrgan().then(res => {
       if (res.code == 200) {
         this.organList = res.data;

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -65,16 +65,11 @@
                            label="学校名称"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
-                           label="收入类型">
-            <template>
-              <div>
-                {{|orderServer}}
-              </div>
-            </template>
+                           label="服务收入">
           </el-table-column>
           <el-table-column align="center"
                            prop="studentId"
-                           label="收入金额"></el-table-column>
+                           label="销售收入"></el-table-column>
           <el-table-column align="center"
                            prop="studentId"
                            label="备注"></el-table-column>

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -11,27 +11,186 @@
         <div style="width:180px"></div>
       </el-form-item>
     </el-form>
-    <el-form>
+    <el-form :model="form"
+             :rules="rules"
+             ref="ruleForm">
       <div class="lookTitle">基本信息</div>
       <el-form-item label="所属分部"
-                    label-width="80px">
-
+                    prop="organId"
+                    :label-width="formLabelWidth">
+        <el-select v-model.trim="form.organId"
+                   :disabled="!isAdd"
+                   @change="changeOrgin"
+                   style="width: 100% !important;">
+          <el-option v-for="(item,index) in organList"
+                     :key="index"
+                     :label="item.name"
+                     :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="所属学校"
-                    label-width="80px">
-
+                    prop="schoolId"
+                    :label-width="formLabelWidth">
+        <el-select v-model="form.schoolId"
+                   :disabled="!isAdd"
+                   @change="checkSchool"
+                   style="width: 100% !important;">
+          <el-option v-for="(item,index) in cooperationList"
+                     :key="index"
+                     :label="item.name"
+                     :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="学员编号"
-                    label-width="80px">
+                    prop="userId"
+                    :label-width="formLabelWidth">
+        <el-input v-model.trim="form.userId"
+                  :disabled="!isAdd"
+                  placeholder="请输入学员编号"></el-input>
       </el-form-item>
       <div class="lookTitle">交易信息</div>
+      <el-form-item label="交易流水号"
+                    prop="transNo"
+                    :label-width="formLabelWidth">
+        <el-input placeholder="请输入交易流水号"
+                  type="text"
+                  :disabled="!isAdd"
+                  v-model.trim="form.transNo"></el-input>
+      </el-form-item>
+      <el-form-item label="收款账户"
+                    prop="merNo"
+                    :label-width="formLabelWidth">
+        <el-input placeholder="请输入收款账户"
+                  type="text"
+                  :disabled="!isAdd"
+                  v-model.trim="form.merNo"></el-input>
+      </el-form-item>
+      <el-form-item label="交易日期"
+                    prop="payTime"
+                    :label-width="formLabelWidth">
+        <el-date-picker style="width: 100%;"
+                        :disabled="!isAdd"
+                        v-model="form.payTime"
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm:ss"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择交易日期">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="收入类型"
+                        :label-width="formLabelWidth"
+                        prop="applyType">
+            <el-select class="multiple"
+                       style="width: 100% !important;"
+                       v-model.trim="form.applyType"
+                       filterable
+                       clearable
+                       :disabled="!isAdd"
+                       placeholder="请选择收入类型">
+              <el-option v-for="(item,index) in orderServerList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value"></el-option>
+            </el-select>
+          </el-form-item> -->
+      <el-form-item label="销售金额"
+                    prop="goodsAmount"
+                    :label-width="formLabelWidth">
+        <el-input v-model="form.goodsAmount"
+                  @mousewheel.native.prevent
+                  type="number"
+                  :disabled="!isAdd"
+                  placeholder="请输入销售金额" />
+      </el-form-item>
+      <el-form-item label="服务金额"
+                    prop="serviceAmount"
+                    :label-width="formLabelWidth">
+        <el-input type="number"
+                  @mousewheel.native.prevent
+                  :disabled="!isAdd"
+                  v-model="form.serviceAmount"
+                  placeholder="请输入收入金额" />
+      </el-form-item>
+      <div v-if="form.applyType == 'SELL'">
+        <div v-for="(goodsList, index) in form.goodsList"
+             :key="index">
+          <el-form-item :label="'商品名称' + (index + 1)"
+                        :label-width="formLabelWidth"
+                        class="setWidth"
+                        :prop="'goodsList.' + index + '.id'"
+                        :rules="[{ required: true, message: '请选择商品', trigger: 'change' }]">
+            <el-select v-model.trim="goodsList.id"
+                       filterable
+                       :disabled="!isAdd"
+                       @change="checkgoods"
+                       placeholder="请选择商品">
+              <el-option v-for="(item,index) in shopList"
+                         :key="index"
+                         :label="item.name"
+                         :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="setWidth"
+                        style="margin-right: 10px"
+                        :prop="'goodsList.' + index + '.number'"
+                        :rules="validAmount">
+            <!-- <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
+            <el-input type="age"
+                      style="width: 160px;"
+                      :disabled="!isAdd"
+                      clearable
+                      placeholder="请输入商品数量"
+                      @mousewheel.native.prevent
+                      v-model.number="goodsList.number"></el-input>
+          </el-form-item>
+          <el-button icon="el-icon-minus"
+                     :disabled="!isAdd"
+                     v-if="form.goodsList.length > 1"
+                     circle
+                     @click.prevent="removeGoodsList(goodsList)"></el-button>
+          <el-button icon="el-icon-plus"
+                     :disabled="!isAdd"
+                     @click.prevent="addGoodsList"
+                     circle
+                     style="margin-left: 5px;"></el-button>
+        </div>
+      </div>
+      <div class="lookTitle">其它</div>
+      <el-form-item label="备注"
+                    :label-width="formLabelWidth">
+        <el-input placeholder="请输入备注"
+                  :disabled="!isAdd"
+                  v-model.trim="form.memo"
+                  type="textarea"
+                  :rows="3"></el-input>
+      </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
 export default {
   data () {
-    return {}
+    return {
+      formLabelWidth: "100px",
+      form: {
+        organId: null,
+        transNo: null,
+        type: "OTHER",
+        merNo: null,
+        actualAmount: null,
+        memo: null,
+        payTime: null,
+        serviceAmount: null,
+        goodsAmount: null,
+        schoolId: null,
+        goodsList: [{
+          id: null,
+          number: null
+        }],
+        applyType: null,
+        userId: ''
+      },
+    }
   }
 }
 </script>

src/views/businessManager/orderManager/salesList.vue

@@ -8,12 +8,18 @@
       <el-form :inline="true"
                class="searchForm"
                v-model.trim="searchForm">
+
         <el-form-item>
           <el-input v-model.trim="searchForm.search"
                     placeholder="请输入流水号、订单号"
                     type="text"></el-input>
         </el-form-item>
         <el-form-item>
+          <el-input placeholder="学生姓名"
+                    type="text"
+                    v-model.trim="searchForm.userName"></el-input>
+        </el-form-item>
+        <el-form-item>
           <el-input v-model.trim="searchForm.goodsName"
                     placeholder="请输入商品名称"
                     type="text"></el-input>
@@ -71,6 +77,9 @@
                      type="primary">重置</el-button>
         </el-form-item>
       </el-form>
+      <div class="newBand"
+           @click="onOrderExport"
+           v-permission="{child: 'export/exportSellOrders', parent: '/salesList'}">报表导出</div>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -303,6 +312,7 @@ import pagination from '@/components/Pagination/index'
 import { getSellOrder, updateSellOrder, refundSellOrder } from '@/api/orderManager'
 import { getEmployeeOrgan, getCooperation, findEducationUsers } from '@/api/buildTeam'
 import { paymentChannelStatus } from '@/utils/searchArray'
+import { Export } from '@/utils/downLoadFile'
 import dayjs from 'dayjs'
 export default {
   components: { pagination },
@@ -319,7 +329,8 @@ export default {
         cooperationOrganId: '',
         startTime: null,
         endTime: null,
-        organIdList: []
+        organIdList: [],
+        userName: ''
       },
       tableList: [],
       organList: [],
@@ -489,6 +500,19 @@ export default {
         eduTeacherId: row.eduTeacherId ? row.eduTeacherId : null
       }
       // applyRefundAudit()
+    },
+    onOrderExport () {
+      let params = this.searchForm
+      params.rows = this.pageInfo.limit
+      params.page = this.pageInfo.page
+      this.searchOrderDate(this.orderDate)
+      Export(this, {
+        url: '/api-web/export/exportSellOrders',
+        params: {
+          ...params,
+          organIdList: [...this.searchForm.organIdList].join()
+        }
+      }, '是否确认导出报表？')
     }
   }
 }

vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.248:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
-// let target = 'http://192.168.3.196' // 乔
+// let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**