Merge branch 'master' into zm

src/views/crm/business/Detail.vue

@@ -113,7 +113,7 @@
           :record-id="detailData.flow_id"
           :owner-user-id="detailData.owner_user_id"
           class="examine-info"
-          examine-type="crm_contract"
+          examine-type="crm_business"
           @on-handle="examineHandle"/>
 
         <flexbox class="d-container-bd" align="stretch">
@@ -177,7 +177,7 @@ import {
   crmBusinessAdvanceAPI,
   crmBusinessStatusByIdAPI
 } from '@/api/crm/business'
-
+import { userListAPI } from '@/api/common'
 import SlideView from '@/components/SlideView'
 import CRMDetailHead from '../components/CRMDetailHead'
 import Activity from '../components/Activity' // 活动
@@ -190,7 +190,7 @@ import RelativeTeam from '../components/RelativeTeam' // 团队成员
 import RelativeProduct from '../components/RelativeProduct' // 团队成员
 import RelativeFiles from '../components/RelativeFiles' // 相关附件
 import RelativePrint from '../components/RelativePrint' // 相关打印
-
+import ExamineInfo from '@/components/Examine/ExamineInfo'
 import CRMAllCreate from '../components/CRMAllCreate' // 新建页面
 import DetailMixin from '../mixins/Detail'
 import { separator } from '@/filters/vueNumeralFilter/filters'
@@ -211,6 +211,7 @@ export default {
     RelativeProduct,
     RelativeFiles,
     RelativePrint,
+    ExamineInfo,
     CRMAllCreate
   },
   mixins: [DetailMixin],
@@ -241,6 +242,9 @@ export default {
   data() {
     return {
       // 展示加载loading
+      userOptions: [],
+      value: '',
+      inputValue: '',
       loading: false,
       crmType: 'business',
       headDetails: [
@@ -397,11 +401,36 @@ export default {
       }]
     }
   },
-  mounted() {},
+  mounted() {
+    this.getUserList()
+  },
   methods: {
     /**
      * 详情
      */
+    getUserList() {
+      this.userLoading = true
+      let request = userListAPI
+      let params = {}
+      if (this.userRequest) {
+        request = this.userRequest
+        params = this.userParams || {}
+      } else {
+        params = { pageType: 0 }
+      }
+      request(params)
+        .then(res => {
+          const userList = res.data.list || res.data
+          console.log(userList)
+          this.userOptions = userList.map(item => {
+            return item
+          })
+          this.userLoading = false
+        })
+        .catch(() => {
+          this.userLoading = false
+        })
+    },
     getDetial() {
       this.firstContactsId = ''
       this.loading = true
@@ -566,21 +595,52 @@ export default {
       }
       /** 输单 和 无效 */
       if (item.type == 2 || item.type == 3) {
-        var message = '请填写' + item.name + '原因：'
+        var message = '请填写' + item.name + '原因:'
         var title = item.name + '原因'
 
-        // this.$prompt(message, title, {
-        //   inputType: 'text',
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消'
-        // })
         const h = this.$createElement
+        const msgBoxContent = h('div', [
+          h('p', message),
+          h('textarea', {
+            attrs: {
+              class: 'el-textarea__inner',
+              type: 'textarea',
+              autocomplete: 'off',
+              rows: 4
+            },
+            value: this.inputValue
+          }),
+          h('p', '审核人:'),
+          h('el-select', {
+            ref: 'selectView',
+            props: {
+              clearable: true,
+              filterable: true,
+              placeholder: '请选择',
+              value: this.value
+            },
+            on: {
+              input: val => {
+                this.value = val
+                console.log(val)
+              },
+              change: e => {
+                this.value = e
+                this.$refs['selectView'].value = e
+              }
+            }
+          }, this.userOptions.map(option => {
+            return h('el-option', {
+              props: {
+                value: option.id,
+                label: option.username
+              }
+            })
+          }))
+        ])
         this.$msgbox({
           title: title,
-          message: h('p', message, [
+          message: msgBoxContent,
-            h('i', { style: 'color: teal' }, 'VNode'),
-            h('<xh-user-cell :radio="false" :value="baseFrom.adminUsers" @value-change="userChange" />')
-          ]),
           showCancelButton: true,
           confirmButtonText: '确定',
           cancelButtonText: '取消'
@@ -634,6 +694,16 @@ export default {
           .catch(() => {})
       }
     },
+    /**
+     * 审核操作
+     */
+    examineHandle(data) {
+      // 1 审核通过 2 审核拒绝 4 已撤回
+      if (data.type == 1) {
+        this.getDetial()
+      }
+      this.$emit('handle', { type: 'examine' })
+    },
     /**
      * 新建
      */
@@ -652,6 +722,12 @@ export default {
       console.log('ok')
       this.$emit('handle', { type: 'save-success' })
       this.getDetial()
+    },
+    /**
+     * 刷新value的值
+     */
+    updateVal(val) {
+      this.value = val
     }
   }
 }
@@ -870,5 +946,9 @@ export default {
   .state-handel-item:hover {
     background-color: #f7f8fa;
   }
+  .el-textarea__inner{
+    width: max-content;
+    border: 1px solid #C0C4CC;
+  }
 }
 </style>

src/views/crm/customer/Detail.vue

@@ -32,6 +32,7 @@
           @close="hideView">
           <template slot="name">
             <i v-if="detailData.is_lock == 1" class="wk wk-circle-password" />
+
             <el-tooltip v-if="!isSeasDetail" :content="detailData.star == 0 ? '添加关注' : '取消关注'" effect="dark" placement="top">
               <i
                 :class="{active: detailData.star != 0}"
@@ -45,12 +46,11 @@
           v-if="detailData.flow_id"
           :id="id"
           :record-id="detailData.flow_id"
-          :owner-user-id="detailData.owner_user_id"
+          :owner-user-id="1"
           class="examine-info"
           examine-type="crm_customer_check"
           @on-handle="examineHandle"/>
 
-
         <flexbox
           class="d-container-bd"
           align="stretch">
@@ -131,7 +131,7 @@ import RelativeHandle from '../components/RelativeHandle' // 相关操作
 import RelativeTeam from '../components/RelativeTeam' // 团队成员
 import RelativeVisit from '../components/RelativeVisit' // 回访
 import RelativeInvoice from '../components/RelativeInvoice' // 发票
-
+import ExamineInfo from '@/components/Examine/ExamineInfo'
 import CRMAllCreate from '../components/CRMAllCreate' // 新建页面
 import DetailMixin from '../mixins/Detail'
 
@@ -153,7 +153,8 @@ export default {
     RelativeTeam,
     RelativeVisit,
     CRMAllCreate,
-    RelativeInvoice
+    RelativeInvoice,
+    ExamineInfo
   },
   mixins: [DetailMixin],
   props: {
@@ -184,6 +185,7 @@ export default {
   data() {
     return {
       // 展示加载loading
+      flow_id: 17,
       loading: false,
       crmType: 'customer',
       headDetails: [
@@ -365,8 +367,19 @@ export default {
     }
   },
   watch: {},
-  mounted() {},
+  mounted() {
+  },
   methods: {
+    /**
+     * 审核操作
+     */
+    examineHandle(data) {
+      // 1 审核通过 2 审核拒绝 4 已撤回
+      if (data.type == 1) {
+        this.getDetial()
+      }
+      this.$emit('handle', { type: 'examine' })
+    },
     /**
      * 详情
      */

src/views/crm/message/index.vue

@@ -279,7 +279,6 @@ export default {
     refreshNum() {
       for (let index = 0; index < this.leftSides.length; index++) {
         const element = this.leftSides[index]
-        console.log(this.leftSides[index])
         if (this.messageNum.hasOwnProperty(element.infoType)) {
           element.num = this.messageNum[element.infoType] || 0
           element.hidden = false