chris vor 3 Jahren
Ursprung
Commit
6bb9d3d4d1

+ 3 - 3
src/api/cus.js

@@ -21,7 +21,7 @@ export function getCustomer () {
   })
 }
 
-export function getcoCode () {
+export function getCoCode () {
   return request({
     url: request.adornUrl(`/biz-service/cusCommunication/code/list`),
     method: 'get'
@@ -35,14 +35,14 @@ export function getReviewType () {
   })
 }
 
-export function getcoDetail (coId) {
+export function getCoDetail (coId) {
   return request({
     url: request.adornUrl(`/biz-service/cusCommunication/info/${coId}`),
     method: 'get'
   })
 }
 
-export function getreDetail (reId) {
+export function geTreDetail (reId) {
   return request({
     url: request.adornUrl(`/biz-service/flow/cusContractReview/info/${reId}`),
     method: 'get'

+ 10 - 10
src/views/modules/cus/communicate-add-or-update.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-dialog
-    :title="!id ? '新增': islook ? '详情' : '修改'"
+    :title="!id ? '新增': isLook ? '详情' : '修改'"
     width="70%"
     :close-on-click-modal="false"
     :visible.sync="visible">
@@ -18,7 +18,7 @@
                 v-for="item in options1"
                 :key="item.value"
                 :label="item.customerName"
-                :value="item.customerId">
+                :value="item.cusId">
               </el-option>
             </el-select>
           </el-form-item>
@@ -29,7 +29,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="沟通类别" prop="coType">       
+          <el-form-item label="沟通类别" prop="coType">
             <el-select
               v-model="dataForm.coType"
               :disabled="isLook"
@@ -53,7 +53,7 @@
       <el-row class="my-row">
         <div class="title"><span style="color: red">*</span> 沟通扫描件</div>
         <el-upload
-          v-show="!islook"
+          v-show="!isLook"
           class="upload-demo"
           ref="upload"
           action="https://jsonplaceholder.typicode.com/posts/"
@@ -142,15 +142,15 @@
 
 <script>
   import templateChose from '../warehouse/template-chose'
-  import { getType, getCustomer, getcoDetail } from '@/api/cus'
+  import { getType, getCustomer, getCoDetail } from '@/api/cus'
   export default {
-    name: 'stock-order-inbound',
+    name: 'communicate-add-or-update',
     components: {templateChose},
     data () {
       return {
         inboundVisible: false,
         visible: false,
-        islook: false,
+        isLook: false,
         dictType: 'material_type',
         options: [],
         options1: [],
@@ -175,7 +175,7 @@
     watch: {
       'dataForm.cusId' (value) {
         this.options1.forEach(v => {
-          if (v.customerId === value) {
+          if (v.cusId === value) {
             this.dataForm.name = v.contact
           }
         })
@@ -185,7 +185,7 @@
       async init (id, disabled) {
         this.visible = true
         this.id = id || 0
-        this.islook = disabled
+        this.isLook = disabled
         await getType().then(({data}) => {
           if (data && data.code === '200') {
             this.options = data.data
@@ -197,7 +197,7 @@
           }
         })
         if (!id) return
-        await getcoDetail().then(({data}) => {
+        await getCoDetail().then(({data}) => {
           if (data && data.code === '200') {
             this.dataForm = data.data
           }

+ 2 - 2
src/views/modules/cus/communicate.vue

@@ -33,7 +33,7 @@
         label="客户名称">
       </el-table-column>
       <el-table-column
-        prop="connectName"
+        prop="contact"
         header-align="center"
         align="center"
         label="联系人">
@@ -75,7 +75,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="details(scope.row.coId, true)">查看</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.coId, true)">查看</el-button>
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.coId, false)">编辑</el-button>
         </template>
       </el-table-column>

+ 48 - 44
src/views/modules/cus/customer-add-or-update.vue

@@ -1,17 +1,29 @@
 <template>
   <el-dialog
-    :title="!id ? '新增' : islook ? '详情' : '修改'"
+    :title="!id ? '新增' : display ? '详情' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
       <h4>基础信息</h4>
       <el-form-item label="客户名称" prop="customerName">
-        <el-input v-model="dataForm.customerName" :disabled="islook" placeholder="客户名称"></el-input>
+        <el-input v-model="dataForm.customerName" :disabled="display" placeholder="客户名称"></el-input>
+      </el-form-item>
+      <el-form-item label="客户类型" prop="customerType">
+        <el-select
+          v-model="dataForm.customerType"
+          :disabled="display"
+          placeholder="请选择">
+          <el-option v-for="item in optionsCT"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="客户级别" prop="level">
         <el-select
           v-model="dataForm.level"
-          :disabled="islook"
+          :disabled="display"
           remote
           placeholder="请选择">
           <el-option
@@ -23,60 +35,60 @@
         </el-select>
       </el-form-item>
       <el-form-item label="详细地址" prop="address">
-        <el-input v-model="dataForm.address" :disabled="islook" placeholder="详细地址"></el-input>
+        <el-input v-model="dataForm.address" :disabled="display" placeholder="详细地址"></el-input>
       </el-form-item>
       <el-form-item label="电话" prop="tel">
-        <el-input v-model="dataForm.tel" :disabled="islook" placeholder="电话"></el-input>
+        <el-input v-model="dataForm.tel" :disabled="display" placeholder="电话"></el-input>
       </el-form-item>
       <el-form-item label="邮编">
-        <el-input v-model="dataForm.zipCode" :disabled="islook" placeholder="邮编"></el-input>
+        <el-input v-model="dataForm.zipCode" :disabled="display" placeholder="邮编"></el-input>
       </el-form-item>
       <el-form-item label="传真">
-        <el-input v-model="dataForm.fax" :disabled="islook" placeholder="传真"></el-input>
+        <el-input v-model="dataForm.fax" :disabled="display" placeholder="传真"></el-input>
       </el-form-item>
       <el-form-item label="网址">
-        <el-input v-model="dataForm.url" :disabled="islook" placeholder="网址"></el-input>
+        <el-input v-model="dataForm.url" :disabled="display" placeholder="网址"></el-input>
       </el-form-item>
       <el-form-item label="公司简介">
-        <el-input v-model="dataForm.introduction" :disabled="islook" type="textarea" placeholder="公司简介"></el-input>
+        <el-input v-model="dataForm.introduction" :disabled="display" type="textarea" placeholder="公司简介"></el-input>
       </el-form-item>
       <h4>业务联系人</h4>
       <el-form-item label="联系人" prop="contact">
-        <el-input v-model="dataForm.contact" :disabled="islook" placeholder="联系人"></el-input>
+        <el-input v-model="dataForm.contact" :disabled="display" placeholder="联系人"></el-input>
       </el-form-item>
       <el-form-item label="手机号码" prop="contactTel">
-        <el-input v-model="dataForm.contactTel" :disabled="islook" placeholder="手机号码"></el-input>
+        <el-input v-model="dataForm.contactTel" :disabled="display" placeholder="手机号码"></el-input>
       </el-form-item>
       <el-form-item label="职位">
-        <el-input v-model="dataForm.contactPosition" :disabled="islook" placeholder="职位"></el-input>
+        <el-input v-model="dataForm.contactPosition" :disabled="display" placeholder="职位"></el-input>
       </el-form-item>
       <el-form-item label="邮箱">
-        <el-input v-model="dataForm.contactEmail" :disabled="islook" placeholder="邮箱"></el-input>
+        <el-input v-model="dataForm.contactEmail" :disabled="display" placeholder="邮箱"></el-input>
       </el-form-item>
       <el-form-item label="对接业务员" prop="bizManager">
-        <user-component-all v-model="dataForm.bizManager" :disabled="islook" :userId="dataForm.bizManager" @change="change"/>
+        <user-component-all v-model="dataForm.bizManager" :disabled="display" :userId="dataForm.bizManager" @change="change"/>
         <!-- <el-input v-model="dataForm.bizManager"  placeholder="对接业务员"></el-input> -->
       </el-form-item>
       <h4>财务信息</h4>
       <el-form-item label="企业税号" prop="taxNumber">
-        <el-input v-model="dataForm.taxNumber" disabled placeholder="企业税号"></el-input>
+        <el-input v-model="dataForm.taxNumber" :disabled="display" placeholder="企业税号"></el-input>
       </el-form-item>
       <el-form-item label="发票抬头" prop="invoiceTitle">
-        <el-input v-model="dataForm.invoiceTitle" disabled placeholder="发票抬头"></el-input>
+        <el-input v-model="dataForm.invoiceTitle" :disabled="display" placeholder="发票抬头"></el-input>
       </el-form-item>
       <el-form-item label="开户银行" prop="bank">
-        <el-input v-model="dataForm.bank" disabled placeholder="开户银行"></el-input>
+        <el-input v-model="dataForm.bank" :disabled="display" placeholder="开户银行"></el-input>
       </el-form-item>
       <el-form-item label="银行账号" prop="account">
-        <el-input v-model="dataForm.account" disabled placeholder="银行账号"></el-input>
+        <el-input v-model="dataForm.account" :disabled="display" placeholder="银行账号"></el-input>
       </el-form-item>
       <el-form-item label="单位地址" prop="billingAddr">
-        <el-input v-model="dataForm.billingAddr" disabled placeholder="单位地址"></el-input>
+        <el-input v-model="dataForm.billingAddr" :disabled="display" placeholder="单位地址"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
-      <el-button v-if="!isLook" type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -95,32 +107,23 @@
       return {
         visible: false,
         options: [],
+        // 客户类型
+        optionsCT: [
+          {
+            value: '0',
+            label: '公司'
+          },
+          {
+            value: '1',
+            label: '个人'
+          }
+        ],
         id: 0,
-        islook: false,
-        dataForm: {
-          account: '',
-          address: '',
-          bank: '',
-          billingAddr: '',
-          bizManager: '',
-          bizManagerName: '',
-          contact: '',
-          contactEmail: '',
-          contactPosition: '',
-          contactTel: '',
-          customerName: '',
-          customerType: 0,
-          fax: '',
-          introduction: '',
-          invoiceTitle: '',
-          level: '',
-          taxNumber: '',
-          tel: '',
-          url: '',
-          zipCode: ''
-        },
+        display: false,
+        dataForm: {},
         dataRule: {
           customerName: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
+          customerType: [{required: true, message: '客户类型不能为空', trigger: 'blur'}],
           level: [{ required: true, message: '客户级别不能为空', trigger: 'blur' }],
           address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
           tel: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
@@ -137,7 +140,8 @@
     },
     methods: {
       async init (id, disabled) {
-        this.islook = disabled
+        this.dataForm = {}
+        this.display = disabled
         this.id = id || 0
         this.visible = true
         await getLevel().then(({data}) => {

+ 11 - 2
src/views/modules/cus/customer.vue

@@ -41,6 +41,7 @@
       </el-table-column>
       <el-table-column
         prop="level"
+        :formatter="levelFormat"
         header-align="center"
         align="center"
         label="级别">
@@ -65,7 +66,7 @@
         label="地址">
       </el-table-column>
       <el-table-column
-        prop="bizManager"
+        prop="bizManagerName"
         header-align="center"
         align="center"
         label="对接业务员">
@@ -83,7 +84,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="details(scope.row.customerId, true)">查看</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.customerId, true)">查看</el-button>
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.customerId, false)">编辑</el-button>
         </template>
       </el-table-column>
@@ -183,6 +184,14 @@
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(id, disabled)
         })
+      },
+      // 转换属性“级别”
+      levelFormat (row) {
+        for (let i = 0; i < this.options.length; i++) {
+          if (this.options[i].value === row.level) {
+            return this.options[i].code
+          }
+        }
       }
     }
   }

+ 21 - 0
yarn.lock

@@ -6438,6 +6438,15 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+less-loader@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.nlark.com/less-loader/download/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha1-SY3eOmxsT4h0WO6e0/CGoSrRtGY=
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^4.0.1"
+
 less@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npm.taobao.org/less/download/less-4.1.1.tgz?cache=0&sync_timestamp=1612066490256&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless%2Fdownload%2Fless-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba"
@@ -10285,6 +10294,11 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sortablejs@1.10.2:
+  version "1.10.2"
+  resolved "https://registry.nlark.com/sortablejs/download/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290"
+  integrity sha1-bkA2TZE/mLhaFPZnj5K1wSIfUpA=
+
 sorted-object@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npm.taobao.org/sorted-object/download/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"
@@ -11560,6 +11574,13 @@ vue@2.5.16:
   resolved "https://registry.nlark.com/vue/download/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"
   integrity sha1-B+23XoQSqu7YceuvqZ9GclhKAIU=
 
+vuedraggable@^2.24.3:
+  version "2.24.3"
+  resolved "https://registry.nlark.com/vuedraggable/download/vuedraggable-2.24.3.tgz?cache=0&sync_timestamp=1623379056800&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvuedraggable%2Fdownload%2Fvuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19"
+  integrity sha1-Q8k4SbdGokzlA+Ej1bJZxwG6DRk=
+  dependencies:
+    sortablejs "1.10.2"
+
 vuex@3.0.1:
   version "3.0.1"
   resolved "https://registry.nlark.com/vuex/download/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2"