lilei 2 gadi atpakaļ
vecāks
revīzija
32a9df7e63

+ 1 - 1
public/version.json

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

+ 23 - 8
src/views/salesManagement/productPricing/list.vue

@@ -30,9 +30,21 @@
                 <a-input id="productPricingList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品状态">
+                <v-select
+                  code="ONLINE_FLAG"
+                  id="productPricingList-onlineFalg"
+                  v-model="queryParam.onlineFalg"
+                  allowClear
+                  placeholder="请选择产品状态"
+                ></v-select>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
+            <a-checkbox v-model="queryParam.putStockFlag"><span style="display: inline-block;">显示未入库产品</span></a-checkbox>
+            <a-button style="margin-left: 10px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -102,7 +114,9 @@ export default {
         productBrandSn: undefined,
         productTypeSn1: '',
         productTypeSn2: '',
-        productTypeSn3: ''
+        productTypeSn3: '',
+        onlineFalg: undefined,
+        putStockFlag: false
       },
       productType: [],
       disabled: false, //  查询、重置按钮是否可操作
@@ -110,7 +124,9 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return dealerProductPriceList(Object.assign(parameter, this.queryParam)).then(res => {
+        const params = Object.assign(parameter, this.queryParam)
+        params.putStockFlag = params.putStockFlag ? 1 : 0
+        return dealerProductPriceList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -141,11 +157,8 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '成本价', dataIndex: 'offerCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '市级价', dataIndex: 'cityPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '特约价', dataIndex: 'specialPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '终端会员价', dataIndex: 'terminalPrice', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '产品状态', dataIndex: 'onlineFalgDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isCostPrice) {
@@ -167,7 +180,7 @@ export default {
         arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isTerminalPrice) {
-        arr.splice(arr.length - 1, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(arr.length - 2, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -182,6 +195,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
+      this.queryParam.onlineFalg = undefined
+      this.queryParam.putStockFlag = false
       this.productType = []
       this.$refs.table.refresh(true)
     },