Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_frontend into develop

src/components/select/SelectBusiness.vue

@@ -21,7 +21,8 @@
           clearable
           placeholder="项目名称"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <!--        <span>显示：</span>-->
         <!--        <el-radio-group v-model="queryForm.type">-->
         <!--          <el-radio-button label="全部客户" />-->

src/components/select/SelectBusinessContact.vue

@@ -7,7 +7,8 @@
           clearable
           placeholder="客户名称/手机/电话"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <table-tool :check-list.sync="checkList" :columns="columns" style="float: right" />
       </el-col>
     </el-row>

src/components/select/SelectCustomer.vue

@@ -21,7 +21,8 @@
           clearable
           placeholder="客户名称"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <!--        <span>显示：</span>-->
         <!--        <el-radio-group v-model="queryForm.type">-->
         <!--          <el-radio-button label="全部客户" />-->

src/components/select/SelectCustomerContact.vue

@@ -17,11 +17,12 @@
     <el-row>
       <el-col :span="24">
         <el-input
-          v-model="queryForm.keyword"
+          v-model="queryForm.cuctName"
           clearable
           placeholder="客户名称/手机/电话"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <!--        <span>显示：</span>-->
         <!--        <el-radio-group v-model="queryForm.type">-->
         <!--          <el-radio-button label="全部客户" />-->
@@ -105,7 +106,7 @@
       return {
         innerVisible: false,
         queryForm: {
-          keyword: '',
+          cuctName: '',
           type: '全部客户',
           pageNum: 1,
           pageSize: 10,

src/components/select/SelectDistributor.vue

@@ -21,7 +21,8 @@
           clearable
           placeholder="经销商名称"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <table-tool :check-list.sync="checkList" :columns="columns" style="float: right" />
       </el-col>
     </el-row>

src/components/select/SelectProduct.vue

@@ -21,7 +21,8 @@
           clearable
           placeholder="产品名称"
           style="width: 30%; margin-right: 10px"
-          suffix-icon="el-icon-search" />
+          suffix-icon="el-icon-search"
+          @keyup.enter.native="fetchData" />
         <table-tool :check-list.sync="checkList" :columns="columns" style="float: right" />
       </el-col>
     </el-row>

src/views/base/distributor/components/DistrEdit.vue

@@ -1,54 +1,3 @@
-<!-- <template>
-  <el-dialog
-    :title="title"
-    :visible.sync="dialogFormVisible"
-    width="500px"
-    @close="close">
-    <el-form ref="form" label-width="80px" :model="form" :rules="dist">
-      <el-form-item label="名称" prop="distName">
-        <el-input v-model.trim="form.distName" />
-      </el-form-item>
-      <el-form-item label="助记名" prop="abbrName">
-        <el-input v-model.trim="form.abbrName" />
-      </el-form-item>
-      <el-form-item label="说明" prop="distDesc">
-        <el-input v-model.trim="form.distDesc" />
-      </el-form-item>
-      <el-form-item label="负责人" prop="distBoss">
-        <el-input v-model.trim="form.distBoss" />
-      </el-form-item>
-      <el-form-item label="电话" prop="distBossPhone">
-        <el-input v-model.trim="form.distBossPhone" />
-      </el-form-item>
-      <el-form-item label="选择省份" prop="provinceDesc">
-        <el-select
-          ref="optionRef"
-          v-model="form.provinceDesc"
-          placeholder="请选择"
-          @change="selectDistrict">
-          <el-option
-            v-for="item in district"
-            :key="item.id"
-            :label="item.distName"
-            :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="省份" prop="provinceId" style="display: none">
-        <el-input v-model.trim="form.provinceId" />
-      </el-form-item>
-      <el-form-item label="销售人员" prop="belongSale">
-        <el-input v-model.trim="form.belongSale" />
-      </el-form-item>
-      <el-form-item label="业务范围" prop="businessScope">
-        <el-input v-model.trim="form.businessScope" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="close">取 消</el-button>
-      <el-button type="primary" @click="save">确 定</el-button>
-    </template>
-  </el-dialog>
-</template> -->
 <template>
   <el-dialog append-to-body :title="title" :visible.sync="dialogFormVisible">
     <el-form ref="form" :model="form" :rules="dist">
@@ -108,9 +57,7 @@
           </el-form-item> -->
           <select-user ref="selectUser" :query-params="{ roles: ['SalesEngineer'] }" @save="selectUser" />
           <el-form-item label="销售人员" prop="belongSale">
-            <el-input v-model="form.belongSale" readonly>
-              <el-button slot="append" icon="el-icon-search" @click="choose" />
-            </el-input>
+            <el-input v-model="form.belongSale" readonly suffix-icon="el-icon-search" @focus="choose" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/base/distributor/index.vue

@@ -59,12 +59,7 @@
           <table-tool :check-list.sync="checkList" :columns="columns" />
           <el-button icon="el-icon-download" style="float: right" />
         </vab-query-form-right-panel>
-        <el-table
-          v-loading="listLoading"
-          border
-          :data="list"
-          style="width: 100%; height: 500px"
-          @selection-change="setSelectRows">
+        <el-table v-loading="listLoading" :data="list" :height="$baseTableHeight(2)" @selection-change="setSelectRows">
           <el-table-column
             v-for="(item, index) in finallyColumns"
             :key="index"
@@ -135,7 +130,7 @@
         columns: [
           {
             label: '经销商名称',
-            width: '160px',
+            width: '200px',
             prop: 'distName',
             sortable: false,
           },

src/views/contract/components/Edit.vue

@@ -21,24 +21,24 @@
             <el-input v-model="editForm.contractCode" disabled placeholder="根据编号规则自动生产" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同名称" prop="contractName">
-            <el-input v-model="editForm.contractName" placeholder="请输入合同名称" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="关联项目" prop="nboName">
-            <el-select
+            <el-input
               v-model="editForm.nboName"
               :disabled="businessData.length > 0"
               placeholder="请选择关联项目"
               readonly
-              style="width: 100%"
+              suffix-icon="el-icon-search"
               @focus="openProject" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="合同名称" prop="contractName">
+            <el-input v-model="editForm.contractName" placeholder="请输入合同名称" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="客户名称" prop="nboId">
             <el-input v-model="editForm.custName" disabled />
@@ -72,22 +72,22 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="销售工程师" prop="inchargeName">
-            <el-select
+            <el-input
               v-model="editForm.inchargeName"
               placeholder="请选择销售工程师"
               readonly
-              style="width: 100%"
+              suffix-icon="el-icon-search"
               @focus="openUser(false, 'inchargeId', 'inchargeName')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="公司签约人" prop="signatoryName">
-            <el-select
+            <el-input
               ref="signatoryName"
               v-model="editForm.signatoryName"
               placeholder="请选择公司签约人"
               readonly
-              style="width: 100%"
+              suffix-icon="el-icon-search"
               @focus="openUser(false, 'signatoryId', 'signatoryName')" />
           </el-form-item>
         </el-col>
@@ -95,11 +95,11 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="经销商" prop="distributorName">
-            <el-select
+            <el-input
               v-model="editForm.distributorName"
               placeholder="请选择经销商"
               readonly
-              style="width: 100%"
+              suffix-icon="el-icon-search"
               @focus="openDistributor" />
           </el-form-item>
         </el-col>
@@ -119,18 +119,18 @@
             </el-select>
           </el-form-item>
           <el-form-item label="客户签约人" prop="custSignatoryName">
-            <el-select
+            <el-input
               v-model="editForm.custSignatoryName"
               :disabled="!businessUserQueryParams.busId"
               placeholder="请选择客户签约人"
               readonly
-              style="width: 100%"
+              suffix-icon="el-icon-search"
               @focus="openContact" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="editForm.remark" placeholder="请输入备注" :rows="4" type="textarea" />
+            <el-input v-model="editForm.remark" placeholder="请输入备注" :rows="5" type="textarea" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -349,6 +349,8 @@
       getBusinessInfo(data) {
         let business = data[0] || null
         if (!business) return
+
+        this.editForm.contractName = business.nboName
         this.editForm.custName = business.custName
         this.editForm.nboId = business.id
         this.editForm.nboName = business.nboName

src/views/customer/components/Allocate.vue

@@ -10,9 +10,7 @@
   <el-dialog title="分配客户" :visible.sync="visible" width="30%" @close="handleClose">
     <el-form label-width="80px" :model="form">
       <el-form-item label="销售代表">
-        <el-input v-model="form.allocate" readonly>
-          <el-button slot="append" icon="el-icon-search" @click="choose" />
-        </el-input>
+        <el-input v-model="form.allocate" readonly suffix-icon="el-icon-search" @focus="choose" />
       </el-form-item>
     </el-form>
     <span slot="footer">
@@ -29,6 +27,7 @@
   import SelectUser from '@/components/select/SelectUser'
   import api from '@/api/customer'
   import to from 'await-to-js'
+
   export default {
     components: {
       // Transfer,

src/views/customer/components/Shift.vue

@@ -11,9 +11,7 @@
     <select-user ref="selectUser" :query-params="{ roles: ['SalesEngineer'] }" @save="selectUser" />
     <el-form ref="form" label-width="80px" :model="form" :rules="rules">
       <el-form-item label="接收对象" prop="SalesName">
-        <el-input v-model="form.salesName" readonly>
-          <el-button slot="append" icon="el-icon-search" @click="choose" />
-        </el-input>
+        <el-input v-model="form.salesName" readonly suffix-icon="el-icon-search" @focus="choose" />
       </el-form-item>
       <el-form-item label="转移相关" prop="about">
         <el-checkbox-group v-model="form.about">

src/views/index/index.vue

@@ -132,7 +132,6 @@
         <div slot="header" class="card-title">
           <span>公告</span>
           <div class="buttons">
-            <el-button icon="el-icon-plus" size="mini">发布</el-button>
             <el-button size="mini">
               更多
               <i class="el-icon-arrow-right el-icon--right"></i>

src/views/proj/business/components/BusinessEdit.vue

@@ -8,30 +8,31 @@
 
     <el-form ref="form" :model="form" :rules="rules">
       <el-row v-if="activeSteps === 1" :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="项目名称" prop="nboName">
-            <el-input v-model="form.nboName" />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="关联客户" prop="custName">
             <el-input
               v-model="form.custName"
               :disabled="Boolean(custInfo.custName)"
               readonly
+              suffix-icon="el-icon-search"
               @focus="handleSelectCustomer" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="项目来源" prop="nboSource">
-            <el-select v-model="form.nboSource" clearable placeholder="项目来源" style="width: 100%">
-              <el-option v-for="dict in nboSourceOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
+          <el-form-item label="产品线" prop="productLine">
+            <el-select v-model="form.productLine" placeholder="请选择" style="width: 100%" @change="changeProductLine">
+              <el-option v-for="item in productLineOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="项目名称" prop="nboName">
+            <el-input v-model="form.nboName" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="主要联系人" prop="contactName">
-            <el-input v-model="form.contactName" readonly @focus="handleSelectContact" />
+            <el-input v-model="form.contactName" readonly suffix-icon="el-icon-search" @focus="handleSelectContact" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -44,14 +45,26 @@
             <el-input v-model="form.contactTelephone" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="项目来源" prop="nboSource">
+            <el-select v-model="form.nboSource" clearable placeholder="项目来源" style="width: 100%">
+              <el-option v-for="dict in nboSourceOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="销售工程师" prop="saleName">
-            <el-input v-model="form.saleName" readonly @focus="handleSelectSale" />
+            <el-input v-model="form.saleName" readonly suffix-icon="el-icon-search" @focus="handleSelectSale" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="销售模式" prop="salesModel">
-            <el-select v-model="form.salesModel" clearable placeholder="销售模式" style="width: 100%">
+            <el-select
+              v-model="form.salesModel"
+              clearable
+              placeholder="销售模式"
+              style="width: 100%"
+              @change="changeSalesModel">
               <el-option v-for="dict in salesModelOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
             </el-select>
           </el-form-item>
@@ -62,16 +75,10 @@
               v-model="form.distributorName"
               :disabled="form.salesModel === '10'"
               readonly
+              suffix-icon="el-icon-search"
               @focus="handleSelectDistributor" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品线" prop="productLine">
-            <el-select v-model="form.productLine" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in productLineOptions" :key="item.key" :label="item.value" :value="item.key" />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="项目预算" prop="nboBudget">
             <amount-input v-model.trim="form.nboBudget" placeholder="请输入金额" />
@@ -151,7 +158,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="负责人员" prop="followUserName">
-            <el-input v-model="form.followUserName" readonly @focus="handleSelectFollowUser" />
+            <el-input
+              v-model="form.followUserName"
+              readonly
+              suffix-icon="el-icon-search"
+              @focus="handleSelectFollowUser" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -229,9 +240,9 @@
       return {
         activeSteps: 1,
         form: {
-          nboName: undefined,
+          nboName: '',
           custId: undefined,
-          custName: undefined,
+          custName: '',
           obtainTime: undefined,
           nboSource: undefined,
           contactId: undefined,
@@ -327,6 +338,12 @@
           this.activeSteps++
         }
       },
+      changeSalesModel() {
+        this.distributorName = undefined
+      },
+      changeProductLine() {
+        this.form.nboName = this.form.custName + this.selectDictLabel(this.productLineOptions, this.form.productLine)
+      },
       handleSelectCustomer() {
         this.$refs.selectCustomer.open()
       },
@@ -358,6 +375,13 @@
           }
           this.form.custId = val[0].id
           this.form.custName = val.map((item) => item.custName).join()
+          this.form.contactId = undefined
+          this.form.contactName = undefined
+          this.form.contactPostion = undefined
+          this.form.contactTelephone = undefined
+
+          let productLineName = this.selectDictLabel(this.productLineOptions, this.form.productLine)
+          this.form.nboName = this.form.custName + productLineName
         }
       },
       selectContact(val) {

src/views/proj/business/components/BusinessGradation.vue

@@ -42,7 +42,11 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="经销商/代理商" prop="distributorName">
-              <el-input v-model="form.distributorName" readonly @focus="handleSelectDistributor" />
+              <el-input
+                v-model="form.distributorName"
+                readonly
+                suffix-icon="el-icon-search"
+                @focus="handleSelectDistributor" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -109,7 +113,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="决策人员" prop="makerName">
-              <el-input v-model="form.makerName" readonly @focus="handleSelectContact" />
+              <el-input v-model="form.makerName" readonly suffix-icon="el-icon-search" @focus="handleSelectContact" />
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/views/proj/business/components/Transfer.vue

@@ -6,7 +6,7 @@
           v-model="form.userName"
           placeholder="选择人员"
           readonly
-          suffix-icon="el-icon-user-solid"
+          suffix-icon="el-icon-search"
           @focus="handleSelectUser" />
       </el-form-item>
       <el-form-item label="转移原因" prop="remark">