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

src/views/base/distributor/index.vue

@@ -201,8 +201,7 @@
       },
       // 节点单击事件
       handleNodeClick(data) {
-        console.log('ID', data.id)
-        this.queryForm.provinceId = data.id
+        this.queryForm.provinceId = parseInt(data.regionCode)
         this.fetchData()
       },
       setSelectRows(val) {

src/views/contract/components/Edit.vue

@@ -305,9 +305,9 @@
           this.title = '新增合同信息'
           // 设置销售工程师默认为当前用户
           this.editForm.inchargeId = this.userId
-          this.editForm.inchargeName = this.username
+          this.editForm.inchargeName = this.nickName
           this.editForm.signatoryId = this.userId
-          this.editForm.signatoryName = this.username
+          this.editForm.signatoryName = this.nickName
         } else {
           this.title = '编辑合同'
           const [err, res] = await to(contractApi.getDetails({ id }))

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

@@ -58,7 +58,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="技术支持内容" prop="technicalSupportContent">
+            <el-form-item label="技术支持内容" prop="technicalSupportContent" :required="type === 'up'">
               <el-input v-model="form.technicalSupportContent" />
             </el-form-item>
           </el-col>
@@ -142,7 +142,7 @@
           </el-col>
         </el-row>
 
-        <el-form-item label="备注原因" prop="remark">
+        <el-form-item :label="title + '原因'" prop="remark">
           <el-input
             v-model="form.remark"
             maxlength="300"
@@ -238,7 +238,9 @@
           technicalSupportName: [
             { validator: validateTechnicalSupport, trigger: ['blur', 'change'], message: '请输入技术支持人员' },
           ],
-          technicalSupportContent: [{ required: true, trigger: ['blur', 'change'], message: '请输入技术支持内容' }],
+          technicalSupportContent: [
+            { validator: validateTechnicalSupport, trigger: ['blur', 'change'], message: '请输入技术支持内容' },
+          ],
           technicalSupportTime: [
             { validator: validateTechnicalSupport, trigger: ['blur', 'change'], message: '请选择技术支持时间' },
           ],

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

@@ -9,11 +9,11 @@
           suffix-icon="el-icon-user-solid"
           @focus="handleSelectUser" />
       </el-form-item>
-      <el-form-item label="备注原因" prop="remark">
+      <el-form-item label="转移原因" prop="remark">
         <el-input
           v-model="form.remark"
           maxlength="300"
-          placeholder="请输入备注原因"
+          placeholder="请输入转移原因"
           rows="5"
           show-word-limit
           type="textarea" />

src/views/proj/business/index.vue

@@ -199,7 +199,7 @@
           {
             label: '销售工程师',
             prop: 'saleName',
-            width: '70px',
+            width: '100px',
           },
           {
             label: '客户名称',
@@ -243,7 +243,7 @@
             width: '120px',
           },
           {
-            label: '是否为大项目',
+            label: '大项目',
             prop: 'isBig',
             width: '70px',
           },
@@ -291,7 +291,7 @@
           '产品线',
           '项目级别',
           '项目预算(万元)',
-          '是否为大项目',
+          '大项目',
           '最新跟进时间',
         ],
         abcColumns: [
@@ -306,7 +306,7 @@
           '经销商/代理商',
           '产品线',
           '项目预算(万元)',
-          '是否为大项目',
+          '大项目',
           '最新跟进时间',
           '最新跟进',
         ],
@@ -321,7 +321,7 @@
           '销售模式',
           '经销商/代理商',
           '产品线',
-          '是否为大项目',
+          '大项目',
           '项目成交时间',
           '合同金额',
         ],