丽格V1.0.1

src/views/club/components/club-multi-dialog.vue

@@ -13,7 +13,7 @@
           v-model="listQuery.name"
           placeholder="请输入机构名称"
           clearable
-          @input="e => (listQuery.productName= checkedInput(e,2))"
+          @input="e => (listQuery.name= checkedInput(e,2))"
         />
       </div>
       <div class="filter-control">

src/views/club/procure-edit.vue

@@ -121,10 +121,26 @@ export default {
     },
     // 确认选择机构
     handleGoodConfirm(data) {
-      this.form.clubList = this.form.clubList.concat(data)
+      const obj = {}
+      const newArr = [...this.form.clubList, ...data]
+      const newUsers = newArr.reduce((item, next) => {
+        obj[next.clubId] ? '' : obj[next.clubId] = true && item.push(next)
+        return item
+      }, [])
+      this.form.clubList = newUsers
       console.log('clubList', this.form.clubList)
       this.handleGoodCancel()
     },
+    concatFunction(arr1, arr2) {
+      // 不要直接使用var arr = arr1，这样arr只是arr1的一个引用，两者的修改会互相影响
+
+      const arr = arr1.concat()
+      // 或者使用slice()复制，var arr = arr1.slice(0)
+      for (var i = 0; i < arr2.length; i++) {
+        arr.indexOf(arr2[i].clubId) === -1 ? arr.push(arr2[i]) : 0
+      }
+      return arr
+    },
     // 提交
     onSubmit(formName) {
       this.$refs[formName].validate(valid => {

src/views/club/procure-list.vue

@@ -2,19 +2,9 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-control">
-        <span style="width: auto;">机构名称:</span>
+        <span style="width: auto;">姓名:</span>
         <el-input
-          v-model="listQuery.userName"
-          placeholder="请输入机构名称"
-          clearable
-          @keyup.enter.native="getList"
-          @clear="getList"
-        />
-      </div>
-      <div class="filter-control">
-        <span style="width: auto;">联系人:</span>
-        <el-input
-          v-model="listQuery.linkMan"
+          v-model="listQuery.name"
           placeholder="请输入联系人姓名"
           clearable
           @keyup.enter.native="getList"
@@ -24,7 +14,7 @@
       <div class="filter-control">
         <span style="width: auto;">手机号:</span>
         <el-input
-          v-model="listQuery.bindMobile"
+          v-model="listQuery.mobile"
           placeholder="请输入手机号"
           clearable
           @keyup.enter.native="getList"
@@ -33,17 +23,7 @@
       </div>
       <div class="filter-control">
         <span style="width: auto;">状态:</span>
-        <el-select v-model="listQuery.clubStatus" style="width:120px;" clearable @change="getList">
-          <el-option value="" label="全部" />
-          <el-option label="待审核" :value="1" />
-          <el-option label="已上线" :value="90" />
-          <el-option label="已上线" :value="91" />
-          <el-option label="审核未通过" :value="92" />
-        </el-select>
-      </div>
-      <div class="filter-control">
-        <span style="width: auto;">绑定微信:</span>
-        <el-select v-model="listQuery.clubStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.status" style="width:120px;" clearable @change="getList">
           <el-option value="" label="全部" />
           <el-option label="待审核" :value="1" />
           <el-option label="已上线" :value="90" />

src/views/finance/details.vue

@@ -26,7 +26,11 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>机构名称：</b> {{ order.clubName }}</el-col>
             <el-col :span="5"><b>下单日期：</b> {{ order.orderTime }}</el-col>
-            <!-- <el-col :span="5"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
+            <el-col :span="7">
+              <b>订单类型：</b>
+              <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
+              <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
+            </el-col>
           </el-row>
           <template v-if="repacts.payWay === 1">
             <h1 class="refund-item-title">订单收款记录：</h1>

src/views/order/detail.vue

@@ -426,21 +426,21 @@
             ><b>发票抬头：</b>
               {{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : "无" }}</el-col>
             <el-col
-              v-if="orderInvoice.invoiceTitleType*1 === 1"
+              v-if="orderInvoice.type*1 === 2 || orderInvoice.invoiceTitleType*1 === 1"
               :span="6"
             ><b>单位税号：</b>
               {{
                 orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : "无"
               }}</el-col>
             <el-col
-              v-if="orderInvoice.invoiceTitleType*1 === 1"
+              v-if="orderInvoice.type*1 === 2 || orderInvoice.invoiceTitleType*1 === 1"
               :span="8"
             ><b>注册地址：</b>
               {{
                 orderInvoice.registeredAddress ? orderInvoice.registeredAddress : "无"
               }}</el-col>
           </el-row>
-          <el-row v-if="orderInvoice.invoiceTitleType*1 === 1" :gutter="24" class="box-row">
+          <el-row v-if="orderInvoice.type*1 === 2 || orderInvoice.invoiceTitleType*1 === 1" :gutter="24" class="box-row">
             <el-col
               :span="6"
             ><b>注册电话：</b>