Merge branch 'wxlNew' of http://git.dayaedu.com/molingzhide/dy-admin-manager into wxlNew

src/api/orderManager.js

@@ -52,7 +52,11 @@ export function routeOrderAdd (data) {
   return request({
     url: api + '/routeOrder/add',
     method: 'post',
-    data: qs.stringify(data)
+
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data,
   })
 }
 

src/views/businessManager/orderManager/financeManager.vue

@@ -195,6 +195,7 @@
                         prop="organId"
                         :label-width="formLabelWidth">
             <el-select v-model.trim="form.organId"
+                       @change="changeOrgin"
                        style="width: 100% !important;">
               <el-option v-for="(item,index) in organList"
                          :key="index"
@@ -203,11 +204,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="所属学校"
-                        prop="organId"
+                        prop="schoolId"
                         :label-width="formLabelWidth">
-            <el-select v-model.trim="form.organId"
+            <el-select v-model.trim="form.schoolId"
                        style="width: 100% !important;">
-              <el-option v-for="(item,index) in organList"
+              <el-option v-for="(item,index) in cooperationList"
                          :key="index"
                          :label="item.name"
                          :value="item.id"></el-option>
@@ -229,11 +230,11 @@
                       v-model.trim="form.transNo"></el-input>
           </el-form-item>
           <el-form-item label="收款账户"
-                        prop="merNos"
+                        prop="merNo"
                         :label-width="formLabelWidth">
             <el-input placeholder="请输入收款账户"
                       type="text"
-                      v-model.trim="form.merNos"></el-input>
+                      v-model.trim="form.merNo"></el-input>
           </el-form-item>
           <el-form-item label="交易日期"
                         prop="payTime"
@@ -251,25 +252,48 @@
                         :label-width="formLabelWidth">
             <el-select v-model.trim="form.saleType"
                        style="width: 100% !important;">
-              <el-option label="服务收入" value="1"></el-option>
-              <el-option label="销售收入" value="2"></el-option>
+              <el-option label="服务收入"
+                         value="1"></el-option>
+              <el-option label="销售收入"
+                         value="2"></el-option>
             </el-select>
           </el-form-item>
-          <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" placeholder="请选择商品">
-                <el-option v-for="(item,index) in organList"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id"></el-option>
-            </el-select>
+          <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"
+                         @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-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;" clearable placeholder="请输入商品数量" @mousewheel.native.prevent v-model.number="goodsList.number" ></el-input>
+              <el-input type="age"
+                        style="width: 160px;"
+                        clearable
+                        placeholder="请输入商品数量"
+                        @mousewheel.native.prevent
+                        v-model.number="goodsList.number"></el-input>
             </el-form-item>
-            <el-button icon="el-icon-minus" v-if="form.goodsList.length > 1" circle @click.prevent="removeGoodsList(goodsList)"></el-button>
-            <el-button icon="el-icon-plus" @click.prevent="addGoodsList" circle style="margin-left: 5px;"></el-button>
+            <el-button icon="el-icon-minus"
+                       v-if="form.goodsList.length > 1"
+                       circle
+                       @click.prevent="removeGoodsList(goodsList)"></el-button>
+            <el-button icon="el-icon-plus"
+                       @click.prevent="addGoodsList"
+                       circle
+                       style="margin-left: 5px;"></el-button>
           </div>
           <el-form-item label="备注"
                         :label-width="formLabelWidth">
@@ -292,7 +316,8 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import { routeOrderFinance, routeOrderAdd } from "@/api/orderManager";
-import { getEmployeeOrgan } from "@/api/buildTeam";
+import { goodsQuery } from '@/api/businessManager'
+import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
 // import store from '@/store'
 import { orderStatus, dealStatus } from "@/utils/searchArray";
 import cleanDeep from 'clean-deep'
@@ -334,6 +359,8 @@ export default {
       },
       tableList: [],
       organList: [],
+      shopList: [],
+      cooperationList: [],
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -351,11 +378,12 @@ export default {
         organId: null,
         transNo: null,
         type: "OTHER",
-        merNos: null,
+        merNo: null,
         actualAmount: null,
         memo: null,
         payTime: null,
         saleType: null,
+        schoolId: null,
         goodsList: [{
           id: null,
           number: null
@@ -368,13 +396,16 @@ export default {
         organId: [
           { required: true, message: "请选择所属分部", trigger: "change" }
         ],
+        schoolId: [
+          { required: true, message: "请选择学校", trigger: "change" }
+        ],
         actualAmount: [
           { required: true, message: "请输入金额", trigger: "blur" }
         ],
         transNo: [
           { required: true, message: "请输入交易流水号", trigger: "blur" }
         ],
-        merNos: [
+        merNo: [
           { required: true, message: "请输入收款账户", trigger: "blur" }
         ],
         payTime: [
@@ -392,6 +423,12 @@ export default {
         this.organList = res.data;
       }
     });
+    goodsQuery({ status: 1, rows: 99999 }).then(res => {
+      if (res.code === 200) {
+
+        this.shopList = res.data.rows
+      }
+    })
     var now = new Date();
     var startDate = new Date(
       Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -421,6 +458,10 @@ export default {
     onOrderSubmit (formName) { // 添加订单
       this.$refs[formName].validate(valid => {
         if (valid) {
+          this.form.goodies = {}
+          for (let i in this.form.goodsList) {
+            this.form.goodies[this.form.goodsList[i]['id']] = this.form.goodsList[i]['number']
+          }
           routeOrderAdd(this.form).then(res => {
             if (res.code == 200) {
               this.$message.success("添加成功");
@@ -440,7 +481,7 @@ export default {
         organId: null,
         transNo: null,
         type: "OTHER",
-        merNos: null,
+        merNo: null,
         actualAmount: null,
         memo: null,
         payTime: null,
@@ -455,7 +496,7 @@ export default {
     onOrderExport () {
       // 报表导出
       let url = "/api-web/export/routeOrderList";
-        let searchForm = this.searchForm;
+      let searchForm = this.searchForm;
       let data = {
         orderType: 3,
         search: searchForm.search,
@@ -521,7 +562,7 @@ export default {
         })
         .catch(() => { });
     },
-    onAdaPayExport() {
+    onAdaPayExport () {
       // 报表导出
       let url = "/api-web/adapay/exportBill";
       let data = {};
@@ -635,17 +676,35 @@ export default {
       };
       this.getList();
     },
-    removeGoodsList(item) {
+    removeGoodsList (item) {
       const index = this.form.goodsList.indexOf(item)
       if (index !== -1) {
         this.form.goodsList.splice(index, 1)
       }
     },
-    addGoodsList() {
+    addGoodsList () {
       this.form.goodsList.push({
         id: null,
         number: null
       })
+    },
+    changeOrgin (val) {
+      this.form.schoolId = null;
+      if (val) {
+        getCooperation({ rows: 9999, organId: val }).then(res => {
+          if (res.code === 200) {
+            this.cooperationList = res.data.rows
+          }
+        })
+      }
+    },
+    checkgoods (val) {
+      for (let i = 0; i <= this.form.goodsList.length - 1; i++) {
+        if (i != this.form.goodsList.length - 1 && this.form.goodsList[i].id === val) {
+          this.form.goodsList[this.form.goodsList.length - 1].id = ''
+        }
+
+      }
     }
   }
 };

vue.config.js

@@ -18,10 +18,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境
-// let target = 'http://192.168.3.139:8000' // 箭河
+let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {