Merge branch 'master' into 11_3_week

# Conflicts:
#	src/views/deposit_commerce/components/refund_list-detail.vue
#	src/views/deposit_home/components/refund_list-detail.vue

src/views/basic_data/taker/taker_list.vue

@@ -289,19 +289,7 @@ export default {
       rules: {
         customerId: [{ required: false, message: '请选择经销商', trigger: 'blur' }],
         takerName: [{ required: true, message: '请输入提货人姓名', trigger: 'blur' }],
-        identity: [
-          {
-            required: true,
-
-            message: '请输入身份证号码',
-            trigger: 'blur'
-          },
-          {
-            pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-            message: '身份证号格式不正确',
-            trigger: 'blur'
-          }
-        ],
+    
         phone: [
           {
             required: true,

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -685,10 +685,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          if (this.isCustomer && !this.detailList.installDate) {
-            this.$message.error('请选择安装时间')
-            return
-          }
+        
           let data = {
             ...this.detailList,
             checkBy: this.checkBy,

src/views/deposit_home/components/refund_list-detail.vue

@@ -901,10 +901,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          if (this.isCustomer && !this.detailList.installDate) {
-            this.$message.error('请选择安装时间')
-            return
-          }
+
 
           if (this.isCustomer) {
             for (let i = 0; i < this.detailList.items.length; i++) {

src/views/supply/engin/components/home_examine.vue

@@ -77,7 +77,9 @@
               :disabled="detailData.examineStatus == 'OK' && isDealer"
               clearable
             >
-              <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" />
+              <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" >
+                <span>{{ item.saleName }}</span> <span style="color: #f00">{{ item.saleCode }}</span>
+              </el-option>
             </el-select>
           </div>
         </el-col>
@@ -425,7 +427,7 @@
 
 <script>
 import { getOrderDetail, examineHome } from '@/api/supply/engin'
-import { getTypeList, getSalesmanList } from '@/api/common'
+import { getTypeList, getSalesmanList, getHomeTypeList } from '@/api/common'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -513,11 +515,9 @@ export default {
 
     // 获取销售类型列表
     getSalesTypeList() {
-      getTypeList({
-        pageNum: 1,
-        pageSize: -1
-      }).then(res => {
-        this.salesTypeList = res.data.records
+      getHomeTypeList().then(res => {
+        this.salesTypeList = res.data
+        console.log(res.data)
       })
     },