Browse Source

价格显示

lilei 2 years ago
parent
commit
40ddf59247

+ 1 - 1
public/version.json

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

+ 25 - 2
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -31,6 +31,26 @@
           </template>
           </template>
           <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
           <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
         </a-form-model-item>
+        <a-form-model-item prop="showPrice">
+          <template slot="label">
+            <a-tooltip placement="top">
+              <template slot="title">
+                1、非铺货产品,是指不是货架上的产品<br>
+                2、终端会员价,对于汽修厂来说,即进货价<br>
+                3、如果该产品在销售单里有销售记录,则使用最近一次销售价,如果没有销售记录,则使用箭冠总公司的终端会员价
+              </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>
+          </template>
+          <a-select v-model="form.showPrice" placeholder="请选择价格显示">
+            <a-select-option value="1">
+              非铺货产品——显示价格
+            </a-select-option>
+            <a-select-option value="0">
+              非铺货产品——不显示价格
+            </a-select-option>
+          </a-select>
+        </a-form-model-item>
       </a-form-model>
       </a-form-model>
       <div class="btn-cont">
       <div class="btn-cont">
         <a-button type="primary" id="shelfSet-basicInfo-modal-save" @click="handleSave">保存</a-button>
         <a-button type="primary" id="shelfSet-basicInfo-modal-save" @click="handleSave">保存</a-button>
@@ -76,11 +96,13 @@ export default {
       },
       },
       form: {
       form: {
         customerSn: undefined,
         customerSn: undefined,
-        shelfName: ''
+        shelfName: '',
+        showPrice: undefined
       },
       },
       rules: {
       rules: {
         shelfName: [{ required: true, message: '请输入货架名称', trigger: 'change' }],
         shelfName: [{ required: true, message: '请输入货架名称', trigger: 'change' }],
-        customerSn: [{ required: true, message: '请选择关联客户', trigger: 'change' }]
+        customerSn: [{ required: true, message: '请选择关联客户', trigger: 'change' }],
+        showPrice: [{ required: true, message: '请选择价格显示', trigger: 'change' }]
       }
       }
     }
     }
   },
   },
@@ -131,6 +153,7 @@ export default {
         const _this = this
         const _this = this
         this.$nextTick(() => {
         this.$nextTick(() => {
           _this.form.shelfName = _this.nowData.shelfName
           _this.form.shelfName = _this.nowData.shelfName
+          _this.form.showPrice = _this.nowData.showPrice
           const custome = _this.nowData.customerEntity
           const custome = _this.nowData.customerEntity
           if (custome) {
           if (custome) {
             _this.form.customerSn = custome.customerSn || ''
             _this.form.customerSn = custome.customerSn || ''

+ 26 - 3
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -5,7 +5,6 @@
         <!-- 自定义的二级文字标题 -->
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
         <template slot="subTitle">
           <a id="shelfSet-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a id="shelfSet-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span class="store-info">货架名称:{{ basicInfoData&&basicInfoData.shelfName || '--' }}</span>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 内容 -->
       <!-- 内容 -->
@@ -16,8 +15,32 @@
               <span>基础信息</span>
               <span>基础信息</span>
               <a-button icon="edit" size="small" type="link" style="margin-left: 20px;color: #39f;" @click.stop="openInfoModal = true">编辑</a-button>
               <a-button icon="edit" size="small" type="link" style="margin-left: 20px;color: #39f;" @click.stop="openInfoModal = true">编辑</a-button>
             </template>
             </template>
-            <a-descriptions :column="1">
-              <a-descriptions-item label="关联客户">{{ (basicInfoData&&basicInfoData.customerEntity&&basicInfoData.customerEntity.customerName) || '--' }}</a-descriptions-item>
+            <a-descriptions :column="3">
+              <a-descriptions-item label="货架名称">{{ basicInfoData&&basicInfoData.shelfName || '--' }}</a-descriptions-item>
+              <a-descriptions-item>
+                <template slot="label">
+                  <a-tooltip placement="top">
+                    <template slot="title">
+                      <span>此数字货架,归属于您的哪一位客户。如果没有搜索到客户,请在客户管理功能中新建客户。</span>
+                    </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>
+                </template>
+                {{ (basicInfoData&&basicInfoData.customerEntity&&basicInfoData.customerEntity.customerName) || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item>
+                <template slot="label">
+                  <a-tooltip placement="top">
+                    <template slot="title">
+                      1、非铺货产品,是指不是货架上的产品<br>
+                      2、终端会员价,对于汽修厂来说,即进货价<br>
+                      3、如果该产品在销售单里有销售记录,则使用最近一次销售价,如果没有销售记录,则使用箭冠总公司的终端会员价
+                    </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>
+                </template>
+                非铺货产品——{{ basicInfoData&&basicInfoData.showPrice ? '显示': '不显示' }}价格
+              </a-descriptions-item>
             </a-descriptions>
             </a-descriptions>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>