Selaa lähdekoodia

Merge branch 'develop_yh45' of jianguan-web/qpls-md-html into develop_yh47

李磊 9 kuukautta sitten
vanhempi
commit
53c4393ff3

+ 7 - 14
src/views/allocationManagement/storeTransferOut/list.vue

@@ -20,12 +20,12 @@
                 <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
                 <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="店内调出单号">
+                <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="店内调出单号">
-                  <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象名称">
                 <a-form-item label="调往对象名称">
                   <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
                   <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
@@ -62,13 +62,8 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="storeTransferOutList-putPersonRelationType" v-model="queryParam.putPersonRelationType" allowClear placeholder="请选择客户关系"></v-select>
-                </a-form-model-item>
-              </a-col>
             </template>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -193,7 +188,6 @@ export default {
         auditEndDate: '',
         auditEndDate: '',
         outWarehouseBeginDate: '',
         outWarehouseBeginDate: '',
         outWarehouseEndDate: '',
         outWarehouseEndDate: '',
-        putPersonRelationType: undefined, // 客户关系
         customerNameCurrent: undefined, //  调往对象
         customerNameCurrent: undefined, //  调往对象
         customerSnCurrent: undefined,
         customerSnCurrent: undefined,
         storeCallOutNo: undefined, // 店内调出单号
         storeCallOutNo: undefined, // 店内调出单号
@@ -236,7 +230,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: '14%', align: 'center' },
         { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: '14%', align: 'center' },
         { title: '调往对象名称', width: '16%', align: 'center', customRender: function (text, record) { return (record.putPersonType == 'CUSTOMER' ? record.customerNameCurrent : record.putPersonName) || '--' }, ellipsis: true },
         { title: '调往对象名称', width: '16%', align: 'center', customRender: function (text, record) { return (record.putPersonType == 'CUSTOMER' ? record.customerNameCurrent : record.putPersonName) || '--' }, ellipsis: true },
-        { title: '客户关系', dataIndex: 'putPersonRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
+        // { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'callOutTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'callOutTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -309,7 +303,6 @@ export default {
         this.$refs.custList.resetForm()
         this.$refs.custList.resetForm()
       }
       }
       this.queryParam.customerSnCurrent = undefined
       this.queryParam.customerSnCurrent = undefined
-      this.queryParam.putPersonRelationType = undefined
       this.queryParam.customerNameCurrent = undefined
       this.queryParam.customerNameCurrent = undefined
       this.queryParam.storeCallOutNo = undefined
       this.queryParam.storeCallOutNo = undefined
       this.queryParam.callOutType = undefined
       this.queryParam.callOutType = undefined

+ 3 - 4
src/views/common/custList.vue

@@ -16,7 +16,7 @@
     allowClear
     allowClear
   >
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerName" :disabled="(isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled?item.dealerFlag==1:false)">
+    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerName" :disabled="pageType&&pageType==='1'?false:((isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled ? item.dealerFlag==1:false))">
       {{ item.customerName }}
       {{ item.customerName }}
       <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
       <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
     </a-select-option>
     </a-select-option>
@@ -63,7 +63,7 @@ export default {
       type: [String, Number],
       type: [String, Number],
       default: 'all'
       default: 'all'
     },
     },
-    pageType: {
+    pageType: {// 页面类型
       type: String,
       type: String,
       default: '0' // 0客户名称  1被合并的客户名称
       default: '0' // 0客户名称  1被合并的客户名称
     }
     }
@@ -96,8 +96,7 @@ export default {
       if (this.isEnabled) {
       if (this.isEnabled) {
         params.enabledFlag = 1
         params.enabledFlag = 1
       }
       }
-      const ajaxUrl = this.pageType === '0' ? custList : queryCanCustomer
-      ajaxUrl(params).then(res => {
+      custList(params).then(res => {
         if (fetchId !== this.lastFetchId) {
         if (fetchId !== this.lastFetchId) {
           return
           return
         }
         }

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

@@ -114,7 +114,7 @@
     <!-- 客户详情 -->
     <!-- 客户详情 -->
     <customer-management-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
     <customer-management-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
     <!-- 合并用户 -->
     <!-- 合并用户 -->
-    <merge-customer-modal pageType="1" :openModal="openMergeModal" :params="customerTemp" @close="closeMergeModal" />
+    <merge-customer-modal :openModal="openMergeModal" :params="customerTemp" @close="closeMergeModal" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 

+ 3 - 5
src/views/customerManagement/customerInfo/mergeCustomerModal.vue

@@ -25,8 +25,9 @@
           <custList
           <custList
             ref="custList"
             ref="custList"
             :notSn="form.customerSnTarget"
             :notSn="form.customerSnTarget"
-            :dealerFlag="0"
+            dealerFlag="all"
             dealerDisabled
             dealerDisabled
+            pageType="1"
             @change="custChange"
             @change="custChange"
             placeholder="输入客户名称搜索"></custList>
             placeholder="输入客户名称搜索"></custList>
         </a-form-model-item>
         </a-form-model-item>
@@ -103,9 +104,6 @@ export default {
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',
         content: '确定要合并吗?合并后数据不可恢复。',
         content: '确定要合并吗?合并后数据不可恢复。',
-        okText: '确定',
-        okType: 'danger',
-        cancelText: '取消',
         onOk () {
         onOk () {
           _this.form.id = _this.params.id
           _this.form.id = _this.params.id
           custMerge(_this.form).then(res => {
           custMerge(_this.form).then(res => {
@@ -143,7 +141,7 @@ export default {
 }
 }
 </script>
 </script>
 
 
-<style lang="less">
+<style lang="less" scoped>
   .merge-customer-modal{
   .merge-customer-modal{
     .ant-modal-body {
     .ant-modal-body {
       padding: 20px;
       padding: 20px;