Kaynağa Gözat

Merge branch 'develop_szhj09' of jianguan-web/qpls-md-html into pre-release

李磊 2 yıl önce
ebeveyn
işleme
07efd84c9e

+ 1 - 1
public/version.json

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

+ 6 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -368,9 +368,14 @@ export default {
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
+      // 产品来源
+      if (this.isDealerUp) {
+        arr.splice(6, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+      }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(6, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(this.isDealerUp ? 7 : 6, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
+
       return arr
     },
     chooseColumns () {

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

@@ -321,7 +321,7 @@ export default {
       ]
       // 下级创建,不显示仓库仓位
       if (!this.isOwerEdit) {
-        arr.splice(5, 0, { title: '库存数量', dataIndex: 'currentStockQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       } else {
         arr.splice(5, 0, { title: '仓库', dataIndex: 'warehouseEntity.name', width: '8%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } })
         arr.splice(6, 0, { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })

+ 9 - 9
src/views/salesManagement/salesQuery/list.vue

@@ -11,24 +11,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <custList ref="custList" @change="custChange"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库时间">
-                <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <a-form-item label="销售单号">
+                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <custList ref="custList" @change="custChange"></custList>
+                <a-form-item label="审核时间">
+                  <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-form-item label="出库时间">
+                  <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -282,6 +282,7 @@ export default {
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '折后总售价', dataIndex: 'discountedAmount', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -408,7 +409,6 @@ export default {
     },
     // 选择客户成功
     chooseCustomOk (data) {
-      this.resetData()
       this.$router.push({ name: 'salesAdd', params: { id: data.id, sn: data.salesBillSn, priceType: data.priceType } })
     },
     // 删除

+ 26 - 26
src/views/salesManagement/salesQuery/queryPart.vue

@@ -10,33 +10,33 @@
         :model="queryParam"
         @keyup.enter.native="$refs.table.refresh(true)" >
         <a-row :gutter="5">
-          <a-col :md="4" :sm="24">
+          <a-col :lg="4" :md="6" :sm="12">
             <a-form-model-item label="产品编码">
               <a-input id="productInfoList-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :lg="4" :md="6" :sm="12">
             <a-form-model-item label="产品名称">
               <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :lg="4" :md="6" :sm="12">
             <a-form-model-item label="原厂编码">
               <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :lg="4" :md="6" :sm="12">
             <a-form-model-item label="产品分类">
               <ProductType id="productInfoList-productType" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
+            <a-col :lg="4" :md="6" :sm="12">
               <a-form-model-item label="产品品牌">
                 <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :lg="4" :md="6" :sm="12">
               <a-form-model-item label="仓库">
                 <a-select
                   placeholder="请选择仓库"
@@ -50,7 +50,7 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="8" :sm="24" v-if="$hasPermissions('B_salerVinFindProduct')">
+            <a-col :lg="6" :md="8" :sm="12" v-if="$hasPermissions('B_salerVinFindProduct')">
               <a-form-model-item label="车架号(VIN)" prop="vinCode">
                 <a-input id="productInfoList-vinCode" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入车架号(VIN)">
                   <a-icon @click="uploadFun" :type="vinLoading?'loading':'camera'" slot="addonAfter" :style="{ fontSize: '18px', verticalAlign: 'bottom' }" />
@@ -59,7 +59,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="4" :sm="12" style="margin-bottom: 10px;">
+          <a-col :lg="4" :md="6" :sm="12" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
@@ -67,10 +67,11 @@
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>
           </a-col>
-          <a-col :md="4" :sm="12" style="margin-top: 6px;">
+          <a-col :lg="4" :md="8" :sm="12" style="margin-top: 6px;">
             <a-checkbox v-model="cost" v-if="$hasPermissions('M_ShowAllCost')" id="salesQuery-cost">成本价</a-checkbox>
             <a-checkbox v-model="cityPrice" id="salesQuery-cityPrice">市级价</a-checkbox>
             <a-checkbox v-model="tyuePrice" v-if="$store.state.user.isShowSpecialPrice==1" id="salesQuery-tyuePrice">特约价</a-checkbox>
+            <a-checkbox v-model="zdPrice" id="salesQuery-zdPrice">终端价</a-checkbox>
           </a-col>
         </a-row>
       </a-form-model>
@@ -261,6 +262,7 @@ export default {
       cost: false, // 成本价
       cityPrice: false, // 城市价
       tyuePrice: false, // 特约价
+      zdPrice: false, // 终端价
       openCarInfoModal: false,
       onlyList: false
     }
@@ -273,30 +275,28 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: '11%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'salePrice', scopedSlots: { customRender: 'salePrice' }, width: '7%', align: 'center' },
-        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: '6%', align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.cost) {
-        arr.splice(6, 0, { slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ slots: { title: 'costTitle' }, dataIndex: 'putCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       if (this.cityPrice) {
-        arr.splice(this.cost ? 7 : 6, 0, { title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '市级价', dataIndex: 'dealerProduct.cityPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       if (this.tyuePrice) {
-        let s = 6
-        if (this.cost && this.cityPrice) {
-          s = 8
-        }
-        if (!this.cost || !this.cityPrice) {
-          s = 7
-        }
-        arr.splice(s, 0, { title: '特约价', dataIndex: 'dealerProduct.specialPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '特约价', dataIndex: 'dealerProduct.specialPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
-      return arr
+      if (this.zdPrice) {
+        arr.push({ title: '终端价', dataIndex: 'dealerProduct.terminalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+
+      return arr.concat([
+        { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'salePrice', scopedSlots: { customRender: 'salePrice' }, width: '7%', align: 'center' },
+        { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: '6%', align: 'center' },
+        { title: '库存数量', dataIndex: 'currentQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+      ])
     }
   },
   created () {