浏览代码

bug 修复

lilei 4 年之前
父节点
当前提交
425e0822fd

+ 5 - 0
src/views/common/editInput.js

@@ -57,6 +57,11 @@ const EditableCell = {
       editable: false,
     };
   },
+  watch:{
+    text(newVal,oldVal){
+      this.value = newVal
+    }
+  },
   methods: {
     handleChange(value) {
       this.value = value;

+ 1 - 1
src/views/productManagement/productBrand/editModal.vue

@@ -30,7 +30,7 @@
       </a-form-model>
       <div class="btn-cont">
         <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
-        <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+        <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </div>
   </a-modal>

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -41,7 +41,7 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
         <div slot="message">
-          总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>;总赠品数量:<strong>{{ detailData.totalGiftNum || 0 }}</strong>;急件总款数:<strong>{{ detailData.urgentTotalCategory || 0 }}</strong>;急件总数量:<strong>{{ detailData.urgentTotalQty || 0 }}</strong>;<br/>
+          总款数:<strong>{{ detailData.totalCategory || 0 }}</strong>;总数量:<strong>{{ detailData.totalQty || 0 }}</strong>;总赠品数量:<strong>{{ detailData.giftQty || 0 }}</strong>;急件总款数:<strong>{{ detailData.oosCategory || 0 }}</strong>;急件总数量:<strong>{{ detailData.oosQty || 0 }}</strong>;<br/>
           总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;折后总售价:<strong>{{ detailData.discountedAmount || 0 }}</strong>;折扣:<strong>{{ detailData.discountRate || 0 }}%</strong>;折扣金额:<strong>{{ detailData.discountAmount || 0 }}</strong>;
         </div>
       </a-alert>

+ 3 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -91,7 +91,7 @@
         <template slot="price" slot-scope="text, record">
           <editable-cell
             size="small"
-            :text="record.price"
+            :text="text"
             id="salesEdit-price"
             :max="999999"
             :min="0"
@@ -172,7 +172,7 @@ export default {
         { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseEntity.name', width: 100, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
+        { title: '售价', dataIndex: 'price', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
@@ -249,6 +249,7 @@ export default {
     //  重置
     resetSearchForm (flag) {
       this.$refs.table.refresh(!!flag)
+      this.getOrderDetail()
     },
     // 重置列表
     resetForm () {