Merge remote-tracking branch 'origin/develop' into develop

.env

@@ -14,7 +14,6 @@ VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
 # 业务接口微服务名称
 VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
 
-# 协议
 VUE_APP_PROTOCOL='http://'
 # 文件上传
 VUE_APP_UPLOAD_WEED='http://192.168.0.252:9333/dir/assign'

.env.production

@@ -11,8 +11,5 @@ VUE_APP_AdminPath=dashoo.opms.admin-0.0.1
 # 业务接口微服务名称
 VUE_APP_ParentPath=dashoo.opms.parent-0.0.1
 
-# 协议
-VUE_APP_PROTOCOL='https://'
-
 # 文件上传
-VUE_APP_UPLOAD_WEED='https://oms.dashoo.cn/dir/assign'
+VUE_APP_UPLOAD_WEED='http://1.15.100.104:9333/dir/assign'

src/views/customer/components/Edit.vue

@@ -17,7 +17,7 @@
         <el-col :span="12">
           <el-form-item label="客户类型" prop="custIndustry">
             <el-select v-model="editForm.custIndustry" placeholder="请选择客户类型" style="width: 100%">
-              <el-option v-for="item in industryOptions" :key="item.value" :label="item.value" :value="item.value" />
+              <el-option v-for="item in industryOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -227,11 +227,6 @@
         params.custCity = params.city.distName
         params.custRegionId = params.region.id
         params.custRegion = params.region.distName
-        this.industryOptions.forEach((i) => {
-          if (params.custIndustry == i.value) {
-            params.custIndustryCode = i.key
-          }
-        })
         if (!params.followUpDate) params.followUpDate = null
         const [err, res] = await to(api.createCustomer(params))
         if (err) return

src/views/customer/list.vue

@@ -118,7 +118,7 @@
           <span v-else>{{ row[item.prop] }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作">
+      <el-table-column align="center" fixed="right" label="操作" width="90px">
         <template slot-scope="scope">
           <el-button v-permissions="['cust:list:edit']" type="text" @click="handleEdit(scope.row)">编辑</el-button>
           <el-button v-permissions="['cust:list:delete']" type="text" @click="handleDelete(scope.row)">删除</el-button>
@@ -190,7 +190,7 @@
         columns: [
           {
             label: '客户编码',
-            width: '80px',
+            width: '120px',
             prop: 'custCode',
             sortable: false,
             disableCheck: false,
@@ -204,14 +204,14 @@
           },
           {
             label: '助记名',
-            width: 'auto',
+            width: '100px',
             prop: 'abbrName',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '所在省',
-            width: '100px',
+            width: '120px',
             prop: 'custProvince',
             sortable: false,
             disableCheck: false,
@@ -225,7 +225,7 @@
           },
           {
             label: '客户类型',
-            width: '70px',
+            width: '100px',
             prop: 'custIndustry',
             sortable: false,
             disableCheck: false,
@@ -239,28 +239,28 @@
           // },
           {
             label: '客户状态',
-            width: '40px',
+            width: '100px',
             prop: 'custStatus',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '最后跟进时间',
-            width: '120px',
+            width: '150px',
             prop: 'followUpDate',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '最后跟进人',
-            width: '50px',
+            width: '100px',
             prop: 'followUpMan',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '创建时间',
-            width: '120px',
+            width: '150px',
             prop: 'createdTime',
             sortable: false,
             disableCheck: false,
@@ -288,6 +288,7 @@
       },
       handleClick(tab) {
         console.log(tab, 'tab')
+        this.queryForm.pageNum = 1
         this.queryForm.targetType = this.activeName
         this.fetchData()
       },

src/views/customer/openSea.vue

@@ -131,7 +131,7 @@
         label="创建时间"
         min-width="140px"
         prop="createdTime" /> -->
-      <el-table-column align="center" label="操作" width="85px">
+      <el-table-column align="center" fixed="right" label="操作" width="90px">
         <template slot-scope="scope">
           <el-button v-permissions="['cust:open:edit']" type="text" @click="handleEdit(scope.row)">编辑</el-button>
           <el-button v-permissions="['cust:open:delete']" type="text" @click="handleDelete(scope.row)">删除</el-button>
@@ -200,7 +200,7 @@
         columns: [
           {
             label: '客户编码',
-            width: '80px',
+            width: '120px',
             prop: 'custCode',
             sortable: false,
             disableCheck: false,
@@ -214,14 +214,14 @@
           },
           {
             label: '助记名',
-            width: 'auto',
+            width: '100px',
             prop: 'abbrName',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '所在省',
-            width: '100px',
+            width: '120px',
             prop: 'custProvince',
             sortable: false,
             disableCheck: false,
@@ -235,7 +235,7 @@
           },
           {
             label: '客户类型',
-            width: '70px',
+            width: '100px',
             prop: 'custIndustry',
             sortable: false,
             disableCheck: false,
@@ -249,35 +249,35 @@
           // },
           {
             label: '客户状态',
-            width: '40px',
+            width: '100px',
             prop: 'custStatus',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '最后跟进时间',
-            width: '120px',
+            width: '150px',
             prop: 'followUpDate',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '最后跟进人',
-            width: '50px',
+            width: '100px',
             prop: 'followUpMan',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '创建人',
-            width: '50px',
+            width: '100px',
             prop: 'createdName',
             sortable: false,
             disableCheck: false,
           },
           {
             label: '创建时间',
-            width: '120px',
+            width: '150px',
             prop: 'createdTime',
             sortable: false,
             disableCheck: false,