chenrui před 2 roky
rodič
revize
095968e191

+ 27 - 21
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -31,7 +31,7 @@
           </template>
           <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
-        <a-form-model-item prop="showPrice">
+        <!-- <a-form-model-item prop="showPrice">
           <template slot="label">
             <a-tooltip placement="top">
               <template slot="title">
@@ -50,7 +50,7 @@
               非铺货产品——不显示价格
             </a-select-option>
           </a-select>
-        </a-form-model-item>
+        </a-form-model-item> -->
       </a-form-model>
       <div class="btn-cont">
         <a-button type="primary" id="shelfSet-basicInfo-modal-save" @click="handleSave">保存</a-button>
@@ -96,13 +96,13 @@ export default {
       },
       form: {
         customerSn: undefined,
-        shelfName: '',
-        showPrice: undefined
+        shelfName: ''
+        // showPrice: undefined
       },
       rules: {
         shelfName: [{ required: true, message: '请输入货架名称', trigger: 'change' }],
-        customerSn: [{ required: true, message: '请选择关联客户', trigger: 'change' }],
-        showPrice: [{ required: true, message: '请选择价格显示', trigger: 'change' }]
+        customerSn: [{ required: true, message: '请选择关联客户', trigger: 'change' }]
+        // showPrice: [{ required: true, message: '请选择价格显示', trigger: 'change' }]
       }
     }
   },
@@ -121,22 +121,28 @@ export default {
           _this.spinning = true
           shelfSave(form).then(res => {
             if (res.status == 200) {
+              _this.$message.success(ret.message)
+              setTimeout(() => {
+                _this.isShow = false
+                _this.$emit('ok', res.data)
+                _this.spinning = false
+              }, 100)
               // 更新价格显示
-              updateShelfPriceShow({
-                shelfSn: form.shelfSn,
-                paramValue: form.showPrice
-              }).then(ret => {
-                if (ret.status == 200) {
-                  _this.$message.success(ret.message)
-                  setTimeout(() => {
-                    _this.isShow = false
-                    _this.$emit('ok', res.data)
-                    _this.spinning = false
-                  }, 100)
-                } else {
-                  _this.spinning = false
-                }
-              })
+              // updateShelfPriceShow({
+              //   shelfSn: form.shelfSn,
+              //   paramValue: form.showPrice
+              // }).then(ret => {
+              //   if (ret.status == 200) {
+              //     _this.$message.success(ret.message)
+              //     setTimeout(() => {
+              //       _this.isShow = false
+              //       _this.$emit('ok', res.data)
+              //       _this.spinning = false
+              //     }, 100)
+              //   } else {
+              //     _this.spinning = false
+              //   }
+              // })
             } else {
               _this.spinning = false
             }

+ 13 - 12
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -28,7 +28,7 @@
                 </template>
                 {{ (basicInfoData&&basicInfoData.customerEntity&&basicInfoData.customerEntity.customerName) || '--' }}
               </a-descriptions-item>
-              <a-descriptions-item>
+              <!-- <a-descriptions-item>
                 <template slot="label">
                   <a-tooltip placement="top">
                     <template slot="title">
@@ -40,7 +40,7 @@
                   </a-tooltip>
                 </template>
                 非铺货产品——{{ showPrice == '1' ? '显示': '不显示' }}价格
-              </a-descriptions-item>
+              </a-descriptions-item> -->
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -155,7 +155,8 @@ import bindProductModal from './bindProductModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import importHuoweiModal from './importHuoweiModal.vue'
-import { shelfDetail, shelfProductList, shelfProductBatchInsert, delShelfPlaceSn, getShelfPriceShow } from '@/api/shelf'
+// , getShelfPriceShow
+import { shelfDetail, shelfProductList, shelfProductBatchInsert, delShelfPlaceSn } from '@/api/shelf'
 export default {
   name: 'ShelfMonitoringWarehousing',
   components: { STable, VSelect, commonModal, bindProductModal, addHwModal, ImportGuideModal, basicInfoModal, importHuoweiModal },
@@ -212,14 +213,14 @@ export default {
   },
   methods: {
     // 获取价格显示设置
-    getShelfPriceShow () {
-      getShelfPriceShow({ shelfSn: this.$route.params.sn }).then(res => {
-        if (res.status == 200) {
-          this.basicInfoData.showPrice = res.data.paramValue
-          this.showPrice = res.data.paramValue
-        }
-      })
-    },
+    // getShelfPriceShow () {
+    //   getShelfPriceShow({ shelfSn: this.$route.params.sn }).then(res => {
+    //     if (res.status == 200) {
+    //       this.basicInfoData.showPrice = res.data.paramValue
+    //       this.showPrice = res.data.paramValue
+    //     }
+    //   })
+    // },
     // 导入或新增货位
     addHW (type) {
       // 导入货位
@@ -249,7 +250,7 @@ export default {
       shelfDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
-          this.getShelfPriceShow()
+          // this.getShelfPriceShow()
         } else {
           this.basicInfoData = null
         }