chenrui 4 年之前
父節點
當前提交
961c4dd0e3

+ 1 - 1
src/utils/request.js

@@ -39,7 +39,7 @@ const err = (error) => {
 service.interceptors.request.use(config => {
   const token = store.getters.token
   if (token) {
-    config.headers['authorization'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
+    config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }
   return config
 }, err)

+ 10 - 10
src/views/basicData/customerTypeManagement/editModal.vue

@@ -18,11 +18,11 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol"
       >
-        <a-form-model-item label="客户类型名称" prop="name">
+        <a-form-model-item label="客户类型名称" prop="customersTypeName">
           <a-input
-            id="customerTypeEdit-name"
+            id="customerTypeEdit-customersTypeName"
             :maxLength="30"
-            v-model="form.name"
+            v-model="form.customersTypeName"
             placeholder="请输入客户类型名称(最多30个字符)"
             allowClear />
         </a-form-model-item>
@@ -69,10 +69,10 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        name: '', // 客户类型名称
+        customersTypeName: '', // 客户类型名称
       },
       rules: {
-        name: [
+        customersTypeName: [
           { required: true, message: '请输入客户类型名称', trigger: 'blur' }
         ],
       }
@@ -112,9 +112,9 @@ export default {
     },
     itemId (newValue, oldValue) {
       if (this.isShow && newValue) {  //  编辑
-        this.form.name = this.nowData && this.nowData.name ? this.nowData.name : ''
+        this.form.customersTypeName = this.nowData && this.nowData.customersTypeName ? this.nowData.customersTypeName : ''
       }else{  //  添加
-        this.form.name = ''
+        this.form.customersTypeName = ''
       }
     }
   }
@@ -124,11 +124,11 @@ export default {
 <style lang="less">
   .customerTypeEdit-modal{
     .ant-modal-body {
-    	padding: 40px 40px 24px;
+      padding: 40px 40px 24px;
     }
     .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
+      text-align: center;
+      margin: 35px 0 10px;
     }
   }
 </style>

+ 35 - 17
src/views/basicData/customerTypeManagement/list.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="类型名称">
-              <a-input id="customerTypeList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入客户类型名称"/>
+              <a-input id="customerTypeList-customersTypeName" v-model.trim="queryParam.customersTypeName" allowClear placeholder="请输入客户类型名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -32,7 +32,9 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="customerTypeList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑客户类型 -->
@@ -41,7 +43,7 @@
 </template>
 
 <script>
-import { custTypeFindAll } from '@/api/custType'
+import { custTypeList, custTypeDel } from '@/api/custType'
 import { STable, VSelect } from '@/components'
 import customerTypeEditModal from './editModal.vue'
 export default {
@@ -49,30 +51,31 @@ export default {
   data () {
     return {
       queryParam: { //  查询条件
-        name: '', //  客户类型名称
+        customersTypeName: '' //  客户类型名称
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '客户类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '客户类型名称', dataIndex: 'customersTypeName', align: 'center', ellipsis: true },
         { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return custTypeFindAll( this.queryParam ).then(res => {
+        return custTypeList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = i + 1
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
           }
           this.disabled = false
           return data
         })
       },
-      openModal: false,  //  新增编辑客户类型  弹框
-      itemId: '',  //  当前id
-      nowData: null  //  当前记录数据
+      openModal: false, //  新增编辑客户类型  弹框
+      itemId: '', //  当前id
+      nowData: null //  当前记录数据
     }
   },
   methods: {
@@ -82,13 +85,30 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       this.itemId = row ? row.id : null
-      this.nowData = row ? row : null
+      this.nowData = row || null
       this.openModal = true
     },
+    // 删除
+    handleDel (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后将不可恢复,确认删除吗?',
+        centered: true,
+        onOk () {
+          custTypeDel({ id: row.id }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
+        }
+      })
+    },
     //  关闭弹框
-    closeModal(){
+    closeModal () {
       this.itemId = ''
       this.openModal = false
       this.$refs.table.refresh(true)
@@ -96,5 +116,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less"></style>

+ 43 - 88
src/views/customerManagement/customerInfo/detailModal.vue

@@ -4,76 +4,24 @@
     class="customerManagementDetail-modal"
     :footer="null"
     :maskClosable="false"
-    :title="modalTit"
+    title="客户详情"
     v-model="isShow"
     @cancle="isShow=false"
     width="80%">
     <!-- 客户详情 -->
-    <div v-if="detailsData">
-      <a-row :gutter="35">
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">客户名称:</p>
-          <p class="item-main">{{ detailsData.name }}</p>
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">联系手机:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">联系人:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-      </a-row>
-      <a-row :gutter="35">
-        <a-col :span="24" class="item-cont">
-          <p class="item-label">客户地址:</p>
-          <p class="item-main">陕西省西安市未央区凤城八路</p>
-          <!-- <p class="item-main">{{ detailsData.provinceName }}{{ detailsData.cityName }}{{ detailsData.districtName }}{{ detailsData.address }}</p> -->
-        </a-col>
-      </a-row>
-      <a-row :gutter="35">
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">客户传真:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">配送方式:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">是否卫星仓客户:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-      </a-row>
-      <a-row :gutter="35">
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">价格类型:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">支付方式:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">收款方式:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-      </a-row>
-      <a-row :gutter="35">
-        <a-col :span="8" class="item-cont">
-          <p class="item-label">联系电话:</p>
-          <p class="item-main">名称思密达</p>
-          <!-- <p class="item-main">{{ detailsData.name }}</p> -->
-        </a-col>
-      </a-row>
+    <div>
+      <a-descriptions :column="3" bordered v-if="detailData">
+        <a-descriptions-item label="客户名称:">{{ detailData.customerName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="联系人:">{{ detailData.contactName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="联系电话:">{{ detailData.contactTel || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
+        <a-descriptions-item label="客户传真:">{{ detailData.fax || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="配送方式:">{{ detailData.dispatchType || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="是否卫星仓客户:">{{ detailData.satelliteFlag || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="价格类型:">{{ detailData.priceType || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="支付方式:">{{ detailData.payType || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款方式:">{{ detailData.settleStyleName || '--' }}</a-descriptions-item>
+      </a-descriptions>
       <div class="btn-cont"><a-button id="customer-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
   </a-modal>
@@ -96,24 +44,30 @@ export default {
     }
   },
   computed: {
-    modalTit () {
-      return '客户详情'
+    // 地址处理
+    addressStr () {
+      const provinceName = this.detailData.provinceName ? this.detailData.provinceName : ''
+      const cityName = this.detailData.cityName ? this.detailData.cityName : ''
+      const countyName = this.detailData.countyName ? this.detailData.countyName : ''
+      const customerAddr = this.detailData.customerAddr ? this.detailData.customerAddr : ''
+      const str = (provinceName || cityName || countyName || customerAddr) ? (provinceName + cityName + countyName + customerAddr) : '--'
+      return str
     }
   },
   data () {
     return {
       isShow: this.openModal, //  是否打开弹框
-      detailsData: null, //  网点数据
+      detailData: null //  网点数据
     }
   },
   methods: {
     //  获取详情
-    getDetail(){
+    getDetail () {
       custFindById({ id: this.itemId }).then(res => {
-        if(res.status == 200){
-          this.detailsData = res.data
-        }else{
-          this.detailsData = null
+        if (res.status == 200) {
+          this.detailData = res.data
+        } else {
+          this.detailData = null
         }
       })
     }
@@ -126,6 +80,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        this.detailData = null
         this.$emit('close')
       }
     },
@@ -141,25 +96,25 @@ export default {
 <style lang="less">
   .customerManagementDetail-modal{
     .ant-modal-body {
-    	padding: 40px 40px 24px;
+      padding: 40px 40px 24px;
     }
     .item-cont {
-    	margin-bottom: 15px;
-    	display: flex;
-    	.item-label {
-    		width: 115px;
-    		font-size: 14px;
-    		color: rgba(0, 0, 0, 0.85);
-    		flex-shrink: 0;
-    	}
-    	.item-main {
-    		flex-grow: 1;
+      margin-bottom: 15px;
+      display: flex;
+      .item-label {
+        width: 115px;
+        font-size: 14px;
+        color: rgba(0, 0, 0, 0.85);
+        flex-shrink: 0;
+      }
+      .item-main {
+        flex-grow: 1;
         word-break: break-all;
-    	}
+      }
     }
     .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
+      text-align: center;
+      margin: 35px 0 10px;
     }
   }
 </style>

+ 78 - 74
src/views/customerManagement/customerInfo/edit.vue

@@ -40,21 +40,21 @@
                 <a-col span="8">
                   <a-form-model-item prop="provinceSn">
                     <a-select id="customerManagementEdit-provinceSn" @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
-                      <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                      <a-select-option v-for="item in addrProvinceList" :value="item.sn" :key="item.sn + 'a'">{{ item.name }}</a-select-option>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
                 <a-col span="8">
                   <a-form-model-item prop="citySn">
                     <a-select id="customerManagementEdit-citySn" @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
-                      <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                      <a-select-option v-for="item in addrCityList" :value="item.sn" :key="item.sn + 'b'">{{ item.name }}</a-select-option>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
                 <a-col span="8">
                   <a-form-model-item prop="countySn">
                     <a-select id="customerManagementEdit-countySn" @change="areaCharged" v-model="form.countySn" placeholder="请选择区/县">
-                      <a-select-option v-for="item in addrAreaList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                      <a-select-option v-for="item in addrDistrictList" :value="item.sn" :key="item.sn + 'c'">{{ item.name }}</a-select-option>
                     </a-select>
                   </a-form-model-item>
                 </a-col>
@@ -86,13 +86,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
-              <v-select
-                code="DISPATCH_FASHION"
-                id="customerManagementEdit-satelliteFlag"
-                v-model="form.satelliteFlag"
-                allowClear
-                placeholder="请选择"
-              ></v-select>
+              <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -104,26 +98,26 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="支付方式" prop="payType">
-              <v-select code="PAY_FASHION" id="customerManagementEdit-payType" v-model="form.payType" allowClear placeholder="请选择支付方式" />
+              <v-select code="PAY_TYPE" id="customerManagementEdit-payType" v-model="form.payType" allowClear placeholder="请选择支付方式" />
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="收款方式" prop="settleStyleSn">
-              <v-select code="RECEIPT_PAYMENT" id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式"></v-select>
+              <v-select code="SETTLE_STYLE_NAME" id="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式"></v-select>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="15">
           <a-col :span="8">
-            <a-form-model-item label="客户类型" prop="custType">
-              <a-select id="customerManagementEdit-custType" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型">
-                <a-select-option v-for="item in custTypeList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+            <a-form-model-item label="客户类型" prop="customerTypeSn">
+              <a-select id="customerManagementEdit-customerTypeSn" v-model="form.customerTypeSn" allowClear placeholder="请选择客户类型">
+                <a-select-option v-for="item in custTypeList" :value="item.customersTypeSn" :key="item.customersTypeSn">{{ item.customersTypeName }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" @click="handleSubmit" id="customerManagementEdit-btn-submit" style="padding: 0 60px;">保存</a-button>
+          <a-button type="primary" @click="handleSubmit" size="large" id="customerManagementEdit-btn-submit" style="padding: 0 60px;">保存</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-card>
@@ -149,11 +143,11 @@ export default {
         contactTel: '', //  联系电话
         contactName: '', //  联系人
         provinceSn: undefined, //  省
-        province: '',
+        provinceName: '',
         citySn: undefined, // 市
-        city: '',
+        cityName: '',
         countySn: undefined, // 区
-        area: '',
+        countyName: '',
         customerAddr: '', //  详细地址
         fax: '', //  客户传真
         dispatchType: '', //  配送方式
@@ -176,7 +170,7 @@ export default {
       },
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
-      addrAreaList: [], //  区下拉
+      addrDistrictList: [], //  区下拉
       custTypeList: [] //  客户类型  下拉数据
     }
   },
@@ -185,7 +179,9 @@ export default {
     getDetail () {
       custFindById({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
-          // this.detailsData = res.data
+          if (res.data.provinceSn) { this.getArea('city', res.data.provinceSn) }
+          if (res.data.citySn) { this.getArea('district', res.data.citySn) }
+          this.form = Object.assign(this.form, res.data)
         } else {
           this.$refs.ruleForm.resetFields()
         }
@@ -207,10 +203,6 @@ export default {
         if (valid) {
           const form = _this.form
           form.id = this.$route.params.id ? this.$route.params.id : null
-          const areas = [ form.provinceSn, form.citySn, form.countySn ]
-          form.areas = areas.join(',')
-          delete form.provinceSn
-          delete form.citySn
           console.log(form, '-----提交信息')
           custSave(form).then(res => {
             if (res.status == 200) {
@@ -230,59 +222,71 @@ export default {
     handleBack () {
       this.$router.push({ path: '/customerManagement/customerInfo/list' })
     },
-	// 获取城市列表
-	getCityList (val) {
-	  this.addrCityList = []
-	  this.addrDistrictList = []
-	  this.form.cityCode = undefined
-	  this.form.districtCode = undefined
-	  this.form.address = ''
-	  this.getArea('city', val)
-	},
-	// 获取区县列表
-	getAreaList (val) {
-	  this.addrDistrictList = []
-	  this.form.districtCode = undefined
-	  this.form.address = ''
-	  this.getArea('district', val)
-	},
-	// 区县变更
-	areaCharged (val) {
-	  this.form.address = ''
-	},
-	//  省/市/区
-	getArea (type, sn) {
-	  let params
-	  if (type == 'province') {
-	    params = { level: '1' }
-	  } else {
-	    params = { psn: sn }
-	  }
-	  getArea(params).then(res => {
-	    if (res.status == 200) {
-	      if (type == 'province') {
-	        this.addrProvinceList = res.data || []
-	      } else if (type == 'city') {
-	        this.addrCityList = res.data || []
-	      } else if (type == 'district') {
-	        this.addrDistrictList = res.data || []
-	      }
-	    } else {
-	      if (type == 'province') {
-	        this.addrProvinceList = []
-	      } else if (type == 'city') {
-	        this.addrCityList = []
-	      } else if (type == 'district') {
-	        this.addrDistrictList = []
-	      }
-	    }
-	  })
-	}
+    // 获取城市列表
+    getCityList (val) {
+      const index = this.addrProvinceList.findIndex(item => item.sn == val)
+      if (index >= 0) {
+        this.form.provinceName = this.addrProvinceList[index].name
+      }
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.form.citySn = undefined
+      this.form.countySn = undefined
+      this.form.customerAddr = ''
+      this.getArea('city', val)
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      const index = this.addrCityList.findIndex(item => item.sn == val)
+      if (index >= 0) {
+        this.form.cityName = this.addrCityList[index].name
+      }
+      this.addrDistrictList = []
+      this.form.countySn = undefined
+      this.form.customerAddr = ''
+      this.getArea('district', val)
+    },
+    // 区县变更
+    areaCharged (val) {
+      const index = this.addrDistrictList.findIndex(item => item.sn == val)
+      if (index >= 0) {
+        this.form.countyName = this.addrDistrictList[index].name
+      }
+      this.form.customerAddr = ''
+    },
+    //  省/市/区
+    getArea (type, sn) {
+      let params
+      if (type == 'province') {
+        params = { level: '1' }
+      } else {
+        params = { psn: sn }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (type == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (type == 'city') {
+            this.addrCityList = res.data || []
+          } else if (type == 'district') {
+            this.addrDistrictList = res.data || []
+          }
+        } else {
+          if (type == 'province') {
+            this.addrProvinceList = []
+          } else if (type == 'city') {
+            this.addrCityList = []
+          } else if (type == 'district') {
+            this.addrDistrictList = []
+          }
+        }
+      })
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getArea('province') //  省市区
-      // vm.getCustTypeList() //  客户类型
+      vm.getCustTypeList() //  客户类型
       vm.$refs.ruleForm.resetFields()
       if (vm.$route.params.id) {
         //  编辑页

+ 9 - 9
src/views/customerManagement/customerInfo/list.vue

@@ -26,7 +26,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
-                <a-select-option v-for="item in custData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in custList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -78,13 +78,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="是否卫星仓客户">
-                <v-select code="CHECK_ENABLE_STATE" id="customerManagementList-satelliteFlag" v-model="queryParam.satelliteFlag" allowClear placeholder="请选择"></v-select>
+                <v-select code="FLAG" id="customerManagementList-satelliteFlag" v-model="queryParam.satelliteFlag" allowClear placeholder="请选择"></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户类型">
                 <a-select v-model="queryParam.customerTypeSn" placeholder="请选择客户类型">
-                  <a-select-option v-for="item in custTypeList" :value="item.id" :key="item.id">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in custTypeList" :value="item.customersTypeSn" :key="item.customersTypeSn">{{ item.customersTypeName }}</a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
@@ -151,16 +151,15 @@ export default {
         customerTypeSn: undefined //  客户类型
       },
       disabled: false, //  查询、重置按钮是否可操作
-      custData: [], //  客户 下拉数据
       dateFormat: 'YYYY-MM-DD',
       creatTime: [], //  创建时间
       lastSaleTime: [], //  最后销售时间
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系人', dataIndex: 'contactName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'contactTel', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'customerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contactName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'contactTel', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否卫星仓', dataIndex: 'satelliteFlag', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
@@ -197,7 +196,8 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      custTypeList: [], //  客户类型下拉数据
+      custList: [], //  客户 下拉数据
+      custTypeList: [], //  客户类型 下拉数据
       openModal: false, //  查看客户详情  弹框
       itemId: '' //  当前客户id
     }
@@ -329,7 +329,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getArea('province')
-      // vm.getCustTypeList()
+      vm.getCustTypeList()
     })
   }
 }

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -191,7 +191,7 @@ export default {
     // 单个出库
     handleOutbound (row) {
       this.$confirm({
-        title: '提',
+        title: '提',
         content: '确认要出库吗?',
         centered: true,
         onOk () {

+ 3 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -221,6 +221,7 @@ export default {
         content: '确认要审核吗?',
         okText: '审核通过',
         cancelText: '审核不通过',
+        closable: true,
         centered: true,
         onOk () {
           // delectRolePower({
@@ -241,6 +242,7 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要出库吗?',
+        closable: true,
         centered: true,
         onOk () {
           // delectRolePower({
@@ -269,6 +271,7 @@ export default {
       this.$confirm({
         title: '提示',
         content: '确认要删除吗?',
+        closable: true,
         centered: true,
         onOk () {
           salesDel({ id: row.id }).then(res => {

+ 3 - 5
src/views/supplierManagement/supplierInfo/edit.vue

@@ -89,13 +89,11 @@
             <a-radio :value="0">禁用</a-radio>
           </a-radio-group>
         </a-form-model-item>
+        <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
+          <a-button type="primary" @click="handleSubmit" size="large" id="supplierInfoEdit-btn-submit" style="padding: 0 60px;">保存</a-button>
+        </a-form-model-item>
       </a-form-model>
     </a-card>
-    <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="supplierInfoEdit-btn-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">保存</a-button>
-      </div>
-    </a-affix>
   </div>
 </template>
 

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.194:8503/qpls-md',
+        target: 'http://192.168.16.194:8504/qpls-md',
         // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,