企微客户添加下次联系时间 财务对账修改

src/views/hisStore/storePayment/index.vue

@@ -118,7 +118,8 @@
         <el-table height="500" border v-loading="loading" :data="storePaymentList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="ID" align="center" prop="paymentId" />
-          <el-table-column label="付款单号" align="center" prop="payCode" width="120px" />
+          <el-table-column label="付款单号" align="center" prop="payCode" width="220px" />
+          <el-table-column label="关联订单号" align="center" prop="orderCode" width="180px"/>
           <el-table-column label="会员手机号" align="center" prop="userPhone"  width="120px" />
           <el-table-column label="支付类型" align="center" prop="payTypeCode" />
           <el-table-column label="支付金额" align="center" prop="payMoney" />

src/views/qw/externalContact/index.vue

@@ -435,7 +435,8 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
-      <el-table-column label="下次联系时间" align="center" prop="nextContactTime" />
+      <el-table-column label="下次联系时间" align="center" prop="nextContactTime" width="160px"/>
+      <el-table-column label="沟通内容" align="center" prop="lastContactContent" width="160px"/>
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">

src/views/qw/externalContact/myExternalContact.vue

@@ -424,7 +424,8 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
-      <el-table-column label="下次联系时间" align="center" prop="nextContactTime" />
+      <el-table-column label="下次联系时间" align="center" prop="nextContactTime" width="160px"/>
+      <el-table-column label="沟通内容" align="center" prop="lastContactContent" width="160px"/>
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">
@@ -445,113 +446,38 @@
           <el-tag v-else type="info"> 未绑定</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="沟通内容" align="center" width="100px" fixed="right">
-        <template slot-scope="scope">
-          <el-button @click="handleCommunication(scope.row)" type="text" size="small">
-            {{ scope.row.hasCommunication ? '查看/编辑' : '添加' }}
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit-outline"-->
-<!--            @click="handleUpdateCustomer(scope.row)"-->
-<!--            >-->
-<!--            <span v-if="scope.row.customerId">换绑CRM</span>-->
-<!--            <span v-else>绑定CRM</span>-->
-<!--          </el-button>-->
-
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdateUser(scope.row)"
-            >
-            <span v-if="scope.row.fsUserId">换绑会员</span>
-            <span v-else>绑定会员</span>
-          </el-button>
-
-          <el-button v-show="scope.row.fsUserId"
-            size="mini"
-            type="text"
-            icon="el-icon-thumb"
-            @click="handleUnBindUserId(scope.row)"
-            v-hasPermi="['qw:externalContact:unBindUserId']"
-          >
-            <span>解除会员绑定</span>
-          </el-button>
-          <el-button v-show="scope.row.fsUserId"
-            size="mini"
-            type="text"
-            @click="handleDiagnosis(scope.row)"
-          >
-            <span>初诊单</span>
-          </el-button>
-          <el-button
-             size="mini"
-             type="text"
-             @click="handleMemberdetails(scope.row)"
-             v-if="scope.row.fsUserId"
-             >
-             <span>会员详情</span>
-          </el-button>
-          <el-button
-
-             size="mini"
-             type="text"
-             @click="handleInfoCollection(scope.row)"
-          v-if="false"
-             >
-             <span>信息采集</span>
+            @click="handledetails(scope.row)"
+          >用户信息
           </el-button>
-
-<!--          <el-button v-if="scope.row.customerId"-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-paperclip"-->
-<!--            @click="handleShow(scope.row)"-->
-<!--          >CRM客户详情</el-button>-->
-		  <el-button
-		     size="mini"
-		     type="text"
-		     @click="handledetails(scope.row)"
-		     >用户信息
-		  </el-button>
-<!--          <el-button v-if="scope.row.customerId"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-setting"
-                     @click="setCourseSOP(scope.row)"
-          >设置课程SOP</el-button> -->
-        <el-button
-          size="mini"
-          type="text"
-          icon="el-icon-edit"
-          @click="handleChangeStatus(scope.row)"
-          v-hasPermi="['qw:externalContact:changeStatus']"
-        >
-          修改状态
-        </el-button>
           <el-button
-            v-show="scope.row.status==0||scope.row.status==2"
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['qw:externalContact:edit']"
-          >修改备注</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-user-solid"
-            @click="handleAppellation(scope.row)"
-          >修改</el-button>
-          <el-button @click="handleCommunication(scope.row)" type="text" size="small">
-            {{ scope.row.hasCommunication ? '编辑沟通内容' : '编辑沟通内容' }}
+            @click="handleChangeStatus(scope.row)"
+            v-hasPermi="['qw:externalContact:changeStatus']"
+          >
+            修改状态
           </el-button>
+          <el-dropdown @command="(command) => handleMoreCommand(command, scope.row)" style="margin-left: 8px;">
+            <el-button size="mini" type="text">
+              更多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="bindMember" v-if="!scope.row.fsUserId">绑定会员</el-dropdown-item>
+              <el-dropdown-item command="rebindMember" v-if="scope.row.fsUserId">换绑会员</el-dropdown-item>
+              <el-dropdown-item command="unbindMember" v-if="scope.row.fsUserId">解除会员绑定</el-dropdown-item>
+              <el-dropdown-item command="diagnosis" v-if="scope.row.fsUserId">初诊单</el-dropdown-item>
+              <el-dropdown-item command="memberDetail" v-if="scope.row.fsUserId">会员详情</el-dropdown-item>
+              <el-dropdown-item command="editRemark" v-if="scope.row.status==0||scope.row.status==2">修改备注</el-dropdown-item>
+              <el-dropdown-item command="editAppellation">修改称呼</el-dropdown-item>
+              <el-dropdown-item command="communication">编辑沟通内容</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -640,7 +566,7 @@
       </div>
     </el-dialog>
 
-    <el-drawer size="75%" :title="show.title" :visible.sync="show.open">
+    <el-drawer size="50%" :title="show.title" :visible.sync="show.open">
       <customer-details  ref="customerDetails" @refreshList="refreshList"/>
     </el-drawer>
 
@@ -974,7 +900,7 @@
     </el-dialog>
 	<el-drawer
 			:with-header="false"
-	 size="75%"
+	 size="50%"
 	 :title="show.title" :visible.sync="show.open">
 	  <info  ref="Details" />
 	</el-drawer>
@@ -1404,6 +1330,34 @@ export default {
 
   },
   methods: {
+    handleMoreCommand(command, row) {
+      switch(command) {
+        case 'bindMember':
+          this.handleUpdateUser(row);
+          break;
+        case 'rebindMember':
+          this.handleUpdateUser(row);
+          break;
+        case 'unbindMember':
+          this.handleUnBindUserId(row);
+          break;
+        case 'diagnosis':
+          this.handleDiagnosis(row);
+          break;
+        case 'memberDetail':
+          this.handleMemberdetails(row);
+          break;
+        case 'editRemark':
+          this.handleUpdate(row);
+          break;
+        case 'editAppellation':
+          this.handleAppellation(row);
+          break;
+        case 'communication':
+          this.handleCommunication(row);
+          break;
+      }
+    },
     /** 重粉查看操作 */
     showLog(row) {
       this.log.queryParams.fsUserId = row.fsUserId;