lilei 2 years ago
parent
commit
12ad1f9b39

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1687932046125
+  "version": 1687936287395
 }

+ 11 - 3
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -274,11 +274,19 @@ export default {
       console.log(data)
       this.title = '编辑客户信息'
       this.isEdit = true
-      if (data.provinceSn) { this.getArea('city', data.provinceSn) }
-      if (data.citySn) { this.getArea('district', data.citySn) }
       this.form = Object.assign(this.form, data)
       this.form.buyerName = data.buyerNameCurrent || data.buyerName
       this.buyerSnBak = this.form.buyerSn
+      if(data.buyerInfo){
+        this.form.contactTel = data.buyerInfo.contactTel
+        this.form.contactMobile = data.buyerInfo.contactMobile
+        this.form.consigneeName = data.buyerInfo.contactName
+        this.form.provinceSn = data.buyerInfo.provinceSn
+        this.form.citySn = data.buyerInfo.citySn
+        this.form.countySn = data.buyerInfo.countySn
+        if (data.buyerInfo.provinceSn) { this.getArea('city', data.buyerInfo.provinceSn) }
+        if (data.buyerInfo.citySn) { this.getArea('district', data.buyerInfo.citySn) }
+      }
     },
     //  获取详情
     getDetail () {
@@ -372,7 +380,7 @@ export default {
     cancel () {
       this.opened = false
       this.$refs.ruleForm.resetFields()
-      this.$refs.custList.resetForm()
+      this.$refs.custList && this.$refs.custList.resetForm()
       this.$emit('cancel')
     },
     // 获取城市列表

+ 4 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -311,7 +311,10 @@ export default {
       this.$router.push({ path: '/salesManagement/salesReturn/list' })
     },
     // 选择客户成功
-    chooseCustomOk (data) {},
+    chooseCustomOk (data) {
+      this.openModal = false
+      this.getOrderDetail()
+    },
     handleEditCustom () {
       this.openModal = true
       this.$refs.editCustomModal.editCust(this.ordeDetail)

+ 41 - 5
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -5,17 +5,48 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesReturnGrabEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerNameCurrent?ordeDetail.buyerName?ordeDetail.buyerNameCurrent==ordeDetail.buyerName?ordeDetail.buyerNameCurrent:ordeDetail.buyerNameCurrent+'('+ordeDetail.buyerName+')':ordeDetail.buyerNameCurrent:'--' }}</span>
-          <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:30px;vertical-align:middle;">
+          <span style="margin: 0 15px;color: #666;font-size: 18px;font-weight: 600;">退货单号:{{ ordeDetail&&ordeDetail.salesReturnNo||'--' }}</span>
+          <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:10px;vertical-align:middle;">
             基础信息
             <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
           </a-button>
+          <a-button
+            type="link"
+            size="small"
+            @click="handleEditCustom"
+            style="margin-left:10px"
+            class="button-info"
+            key="0"> <a-icon type="edit"></a-icon> 编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
           <Print :disabled="chooseLoadData.length==0" @handlePrint="handlePrint"></Print>
         </template>
       </a-page-header>
+      <!-- 基础信息 -->
+      <a-card size="small" :bordered="false" v-show="isShowBisiceInfo" class="pages-wrap">
+         <a-collapse :activeKey="['1']">
+           <a-collapse-panel key="1" header="基础信息">
+             <a-descriptions size="small" :column="3">
+               <a-descriptions-item label="客户名称">{{ ordeDetail&&ordeDetail.buyerNameCurrent?ordeDetail.buyerName?ordeDetail.buyerName==ordeDetail.buyerNameCurrent?ordeDetail.buyerNameCurrent:ordeDetail.buyerNameCurrent+'('+ordeDetail.buyerName+')':ordeDetail.buyerNameCurrent:'--' }}</a-descriptions-item>
+               <a-descriptions-item label="客户地址">
+                 <div v-if="ordeDetail&&(ordeDetail.provinceName || ordeDetail.cityName || ordeDetail.countyName || ordeDetail.customerAddr)">
+                   {{ ordeDetail&&ordeDetail.provinceName || '' }}
+                   {{ ordeDetail&&ordeDetail.cityName || '' }}
+                   {{ ordeDetail&&ordeDetail.countyName || '' }}
+                   {{ ordeDetail&&ordeDetail.customerAddr || '' }}
+                 </div>
+                 <span v-else>--</span>
+               </a-descriptions-item>
+               <a-descriptions-item label="联系电话">{{ ordeDetail&&ordeDetail.contactTel || '--' }}</a-descriptions-item>
+               <a-descriptions-item label="退货单号">{{ ordeDetail&&ordeDetail.salesReturnNo || '--' }}</a-descriptions-item>
+               <a-descriptions-item label="业务状态">{{ ordeDetail&&ordeDetail.stateDictValue || '--' }}</a-descriptions-item>
+               <a-descriptions-item label="是否抓单">{{ ordeDetail&&ordeDetail.grabFlag==1?'抓单':'不抓单' }}</a-descriptions-item>
+               <a-descriptions-item label="备注">{{ ordeDetail&&ordeDetail.remarks || '--' }}</a-descriptions-item>
+             </a-descriptions>
+           </a-collapse-panel>
+         </a-collapse>
+      </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- 查询配件列表 -->
         <queryPart ref="queryPart" grabFlag="1" :newLoading="isInster" :warehouseCascadeData="warehouseCascadeData" @add="saveProduct"></queryPart>
@@ -165,7 +196,7 @@
     </a-spin>
     <!-- <div class="affix-cont"></div> -->
     <!-- 选择客户弹框 -->
-    <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
+    <choose-custom-modal ref="editCustomModal" :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
   </div>
 </template>
 
@@ -258,7 +289,8 @@ export default {
           return data
         })
       },
-      printerType: 'NEEDLE' //  打印机类型
+      printerType: 'NEEDLE' ,//  打印机类型
+      isShowBisiceInfo: false,
     }
   },
   methods: {
@@ -267,9 +299,13 @@ export default {
       this.$router.push({ path: '/salesManagement/salesReturn/list' })
     },
     // 选择客户成功
-    chooseCustomOk (data) {},
+    chooseCustomOk (data) {
+      this.openModal = false
+      this.getOrderDetail()
+    },
     handleEditCustom () {
       this.openModal = true
+      this.$refs.editCustomModal.editCust(this.ordeDetail)
     },
     // 已选产品  blur
     onCellBlur (val, record, type) {

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.117/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,