Selaa lähdekoodia

Merge branch 'develop_yh47' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh47

chenrui 9 kuukautta sitten
vanhempi
commit
b66e1be0bc

+ 1 - 1
public/version.json

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

+ 9 - 10
src/views/numsGoodsShelves/approveStore/authPass.vue

@@ -123,7 +123,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-model-item label="关联客户" prop="customerSn">
-                <custList ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
+                <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
               </a-form-model-item>
             </a-col>
             <a-col :span="12" v-if="form.settleType == 'CREDIT'">
@@ -142,7 +142,7 @@
                 <template slot="label">
                   <a-tooltip placement="top">
                     <template slot="title">
-                     不勾选则不显示价格,结算价:即易码通进货价。
+                      不勾选则不显示价格,结算价:即易码通进货价。
                     </template>
                     价格权限设置<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
                   </a-tooltip>
@@ -217,7 +217,7 @@ export default {
         applySn: undefined,
         auditStatus: 'PASS' // 通过
       },
-      showPrice:['shelf_price_show','non_shelf_price_show'], // 价格显示
+      showPrice: ['shelf_price_show', 'non_shelf_price_show'], // 价格显示
       rules: {
         storeImage: [{ required: true, message: '请上传门头照片', trigger: 'change' }],
         storeName: [{ required: true, message: '请输入门店名称', trigger: 'change' }],
@@ -306,13 +306,13 @@ export default {
           const shelfSn = res.data.shelfSn
           // 更新价格显示设置
           const priceStr = [
-            {paramCode: 'shelf_price_show',paramValue:0},
-            {paramCode: 'shelf_cost_show',paramValue:0},
-            {paramCode: 'non_shelf_price_show',paramValue:0},
-            {paramCode: 'non_shelf_cost_show',paramValue:0}
-            ]
+            { paramCode: 'shelf_price_show', paramValue: 0 },
+            { paramCode: 'shelf_cost_show', paramValue: 0 },
+            { paramCode: 'non_shelf_price_show', paramValue: 0 },
+            { paramCode: 'non_shelf_cost_show', paramValue: 0 }
+          ]
           priceStr.map(item => {
-             item.paramValue = _this.showPrice.includes(item.paramCode) ? 1 : 0
+            item.paramValue = _this.showPrice.includes(item.paramCode) ? 1 : 0
           })
           // 更新价格显示
           updateShelfPriceShow({
@@ -329,7 +329,6 @@ export default {
               _this.spinning = false
             }
           })
-          
         } else {
           _this.spinning = false
         }

+ 1 - 1
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col flex="300px">
               <a-form-item label="关联客户">
-                <custList ref="custList" :dealerFlag="0" @change="custChange" v-model="queryParam.customerName"></custList>
+                <custList ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
             <a-col flex="300px">

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -29,7 +29,7 @@
               关联客户<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
             </a-tooltip>
           </template>
-          <custList id="shelfSet-basicInfo-modal-custList" ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
+          <custList id="shelfSet-basicInfo-modal-custList" ref="custList" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
         <a-form-model-item prop="showPrice">
           <template slot="label">

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="关联客户">
-                <custList ref="custList" id="shelfSetList-custList" :dealerFlag="0" @change="custChange" :isEnabled="true"></custList>
+                <custList ref="custList" id="shelfSetList-custList" @change="custChange" :isEnabled="true"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 29 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -14,7 +14,12 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" title="基础信息" v-show="isShowBisiceInfo" class="salesReturnDetail-cont">
+      <a-card
+        size="small"
+        :bordered="false"
+        title="基础信息"
+        v-show="!outBizSn && isShowBisiceInfo"
+        class="salesReturnDetail-cont">
         <a-descriptions size="small" :column="3">
           <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerName==detailData.buyerNameCurrent?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</a-descriptions-item>
           <a-descriptions-item label="客户地址">
@@ -33,6 +38,29 @@
           <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
         </a-descriptions>
       </a-card>
+      <a-card size="small" :bordered="false" v-if="outBizSn" class="salesReturnDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions size="small" :column="3">
+              <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerName==detailData.buyerNameCurrent?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</a-descriptions-item>
+              <a-descriptions-item label="客户地址">
+                <div v-if="detailData&&(detailData.provinceName || detailData.cityName || detailData.countyName || detailData.customerAddr)">
+                  {{ detailData&&detailData.provinceName || '' }}
+                  {{ detailData&&detailData.cityName || '' }}
+                  {{ detailData&&detailData.countyName || '' }}
+                  {{ detailData&&detailData.customerAddr || '' }}
+                </div>
+                <span v-else>--</span>
+              </a-descriptions-item>
+              <a-descriptions-item label="联系电话">{{ detailData&&detailData.contactTel || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货单号">{{ detailData&&detailData.salesReturnNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="是否抓单">{{ detailData&&detailData.grabFlag==1?'抓单':'不抓单' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
         <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">

+ 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.113:8550/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.113:8550/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,